Merge branch 'master' into develop
Bug fix to allow post to be deleted.
Merge branch 'develop'