Merge branch 'ejabberd-pleroma-auth' into 'develop'