Merge commit https://github.com/Unholychick/TrinityCore/commit/52c0fc96bb4a8a62218bd383f360c0e1350ef62a