Another merge aftermath overwriting character_data reference to old table
Merge branch 'master' of https://github.com/EQEmu/Server