Update accordingly to recent bukkit commits