Merge of github.com/TrinityCore/TrinityCore