Merge in latest Bukkit updates