closes 1150
Merge branch 'master' of https://github.com/designcreateplay/NodeBB