[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/plero...