Updated against git-Bukkit-1.5.1-R0.1-7-ge80e64d-b2744jnks.