Update towards Spigot 1.8