Merge remote-tracking branch 'origin/0.5.1' into cluster
Merge branch 'cluster' of https://github.com/NodeBB/NodeBB into cluster