Merge branch 'update/pleroma-fe-20180821' into 'develop'