Bukkit/CraftBukkit — pull request #868 by defek7 (2012-08-20 23:29:38+00:00)
Title: Addresses https://bukkit.atlassian.net/browse/BUKKIT-770

Revised implementation after screw up with merges and such.