Revert "Revert "Merge branch 'master' of https://github.com/EQEmu/Server""