Merge branch 'develop' into issue/1342

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

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

diff --cc test/notification_test.exs
Simple merge

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

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge

diff --cc test/web/twitter_api/util_controller_test.exs
Simple merge