Merge current Bukkit Master