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