Merge branch 'develop' into gun

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/application.ex
index 55b5be488179a7aced69363a5dd4875ccdc188d5,33f1705dfc85e978320f5508e782dd91f37bbb8b..719114671e6dbdb70dc15e7ba71611a18bd17c2b
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -35,8 -31,9 +35,9 @@@ defmodule Pleroma.Application d
    # See http://elixir-lang.org/docs/stable/elixir/Application.html
    # for more information on OTP Applications
    def start(_type, _args) do
+     Pleroma.Config.Holder.save_default()
      Pleroma.HTML.compile_scrubbers()
 -    Pleroma.Config.DeprecationWarnings.warn()
 +    Config.DeprecationWarnings.warn()
      Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled()
      Pleroma.Repo.check_migrations_applied!()
      setup_instrumenters()

diff --cc lib/pleroma/config/transfer_task.ex
index b6d80adb7fdc27c55687b944827f416ad04ee31a,7c3449b5e0e06ac27f677dcc74dfca0477caa322..936bc9ab1d1cb7d4b45ef442a675b73f368c9a2d
--- 1/lib/pleroma/config/transfer_task.ex
--- 2/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@@ -104,7 -83,7 +104,7 @@@ defmodule Pleroma.Config.TransferTask d
        key = ConfigDB.from_string(setting.key)
        group = ConfigDB.from_string(setting.group)
  
-       default = Config.Holder.config(group, key)
 -      default = Pleroma.Config.Holder.default_config(group, key)
++      default = Config.Holder.default_config(group, key)
        value = ConfigDB.from_binary(setting.value)
  
        merged_value =

diff --cc test/support/http_request_mock.ex
Simple merge