closes #928, closes #930
Merge branch 'master' of https://github.com/designcreateplay/NodeBB