Merge remote-tracking branch 'remotes/origin/dev_2' into dev
Merge branch 'dev_3' of https://github.com/mcmeteor/hj into dev_3