merge TrinityCore/TrinityCore/master with tkrokli/TrinityCore/master

Update local branch from TC master