Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'