Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes...

diff --cc CHANGELOG.md
index 02ddb6213c400794e5744b6774d86414bafa3597,33252ad3dd0afcb28c6a296f09bdcc9fa95a4fc1..182f5e579add447127e27d6d6b940f200fcc688b
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -7,11 -7,12 +7,13 @@@ The format is based on [Keep a Changelo
  ### Removed
  - **Breaking**: Removed 1.0+ deprecated configurations `Pleroma.Upload, :strip_exif` and `:instance, :dedupe_media`
  - **Breaking**: OStatus protocol support
+ - **Breaking**: MDII uploader
  
  ### Changed
+ - **Breaking:** attachments are removed along with statuses when there are no other references to it
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
  - **Breaking:** attachment links (`config :pleroma, :instance, no_attachment_links` and `config :pleroma, Pleroma.Upload, link_name`) disabled by default
 +- **Breaking:** OAuth: defaulted `[:auth, :enforce_oauth_admin_scope_usage]` setting to `true` which demands `admin` OAuth scope to perform admin actions (in addition to `is_admin` flag on User); make sure to use bundled or newer versions of AdminFE & PleromaFE to access admin / moderator features.
  - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings)
  - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler
  - Enabled `:instance, extended_nickname_format` in the default config

diff --cc config/config.exs
Simple merge