Emergency fix for complience with Bukkit rules.
Merge remote-tracking branch 'origin/master'