Merge branch 'develop' into 'fix/extended-nickname-format-default-config'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index c22995b8288cee3737355fb0f8ceb04d9f2999fb,6ebc46b7d94b01cbbffb8cf0da8b5e2a3b99264a..d2f945004a0059acb403ad8e580b2c46459a84dd
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -23,7 -24,7 +24,8 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
+ - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
 +- Added `:instance, extended_nickname_format` setting to the default config
  
  ## [1.1.0] - 2019-??-??
  ### Security