Untested update to Spigot 1.8