merge of TrinityCore github.com