Merge recent changes on Bukkit:master to redo changes