Merge remote-tracking branch 'upstream/3.3.5' into 3.3.5
Merge branch '3.3.5' of https://github.com/britus/TrinityCore.EoF.Fixes into 3.3.5