Merge pull request #1 from TrinityCore/master

update