Apply Spigot's memory leak fix