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