resolved #997
Merge branch 'master' of github.com:designcreateplay/NodeBB