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