Merge https://github.com/TrinityCore/TrinityCore