Update from upstream SpigotMC
Upstream Merge (Bukkit + CraftBukkit) SpigotMC/Spigot@da20125dab74fe405065308da47e3367123cce49
Plug WorldMap Memory Leak SpigotMC/Spigot@da20125dab74fe405065308da47e3367123cce49