Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Mon, 30 Sep 2019 16:16:22 +0000 (16:16 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 30 Sep 2019 16:16:22 +0000 (16:16 +0000)
Backport !1749 to 1.1

See merge request pleroma/pleroma!1751


Trivial merge