Merge of TrinityCore  branch "master"