Pull in latest CraftBukkit changes