Update to 1.8

Tested with Spigot 1.8 #1658