Sync spigot with the latest changes