Including (already applied) patch from vanilla TrinityCore to TrinityCore-Portable
Hopefully doing commits right now