Merge pull request #1 from SpigotMC/master

merged with newest