Merge branch 'develop' into issue/733

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
index 2fbb1662381b2cc1503a3195dcb8edf39795f0cb,8461b666e2c0ca641ec680540ed6b8f90099d99b..9f6d8b658b5f6ba3a761fcf7d329be05a35fc6f7
--- 1/lib/pleroma/web/activity_pub/transmogrifier.ex
--- 2/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@@ -1062,12 -1062,6 +1062,12 @@@ defmodule Pleroma.Web.ActivityPub.Trans
      end
    end
  
-     |> User.upgrade_changeset(data)
 +  defp upgrade_user(user, data) do
 +    user
++    |> User.upgrade_changeset(data, true)
 +    |> User.update_and_set_cache()
 +  end
 +
    def maybe_retire_websub(ap_id) do
      # some sanity checks
      if is_binary(ap_id) && String.length(ap_id) > 8 do