Merge remote-tracking branch 'upstream/develop' into aliases

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

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

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

diff --cc test/pleroma/web/mastodon_api/views/account_view_test.exs
Simple merge

diff --cc test/pleroma/web/web_finger/web_finger_controller_test.exs
Simple merge