Upstream - Update from CraftBukkit