More re-enumeration prep work
Merge branch 'master' of https://github.com/EQEmu/Server