Merge branch 'develop' into '1427-oauth-admin-scopes'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index bb32732866827965b6fe8ff1f646b500f25ceb85,4b1fdcdce2b8b652a6b9532d1d04a655bf372c15..56b6371d5c0bcb920dc9075e7fc1e8cb70519246
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -50,7 -50,7 +50,8 @@@ The format is based on [Keep a Changelo
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  - MRF: New module which handles incoming posts based on their age. By default, all incoming posts that are older than 2 days will be unlisted and not shown to their followers.
  - User notification settings: Add `privacy_option` option.
+ - User settings: Add _This account is a_ option.
 +- OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
  <details>
    <summary>API Changes</summary>
  

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