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