Merge pull request #1 from TrinityCore/master

Update from trinity master branch