Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4