[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon...

# Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc test/plugs/oauth_scopes_plug_test.exs
Simple merge

diff --cc test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs
Simple merge

diff --cc test/web/oauth/oauth_controller_test.exs
Simple merge

diff --cc test/web/twitter_api/util_controller_test.exs
Simple merge