Implemented Bukkit and CraftBukkit pulls #859 and #1137 respectively