Merge branch 'develop' into refactor/discoverable_user_field

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

diff --cc lib/pleroma/web/metadata/providers/restrict_indexing.ex
Simple merge

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

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

diff --cc test/pleroma/web/admin_api/search_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
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/metadata/providers/restrict_indexing_test.exs
Simple merge

diff --cc test/pleroma/web/metadata_test.exs
Simple merge