I don't know what I did...
Merge branch 'master' of https://github.com/NotoriousDev/GrieferTrap.git