Merge branch 'bugfix/pleroma-email-naming' into 'develop'