Initial support for spigot 1.8