second pass, #981
Merge branch 'master' of github.com:designcreateplay/NodeBB