Merge changes from Bukkit:master