apply latest Spigot Patches
Merge branch 'master-spigot' into 1.7-spigot