Some bugfixes for Spigot 1.8, use with BuildTools.jar