Merge remote-tracking branch 'weteam/master' into WEteam
Merge branch 'merge'
Quick fix for Player.getMaxHealth 1.6.1 api change.