collected changes for Bukkit 1.6.2