Merge changes from CraftBukkit:master