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