almost everything for #2335
Merge branch 'master' of github.com:NodeBB/NodeBB