Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Merge remote-tracking branch 'chaos/master' into wotlk
^_^