Bukkit/CraftBukkit — pull request #863 by V10lator (2012-08-18 12:57:57+00:00)
Title: Fix for  BUKKIT-684

This fixes https://bukkit.atlassian.net/browse/BUKKIT-684

Confirmed by (bukkitDev usernames):
- crazygonuts
- craftycreeper