Updated against CB(git-b2744jnks) since Bukkit Safeguarding policy.