Merge develop branch upstream

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

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

diff --cc lib/pleroma/web/o_auth/o_auth_controller.ex
Simple merge

diff --cc test/pleroma/user_test.exs
Simple merge