Merge branch '3.3.5' of https://github.com/TrinityCore/TrinityCore into 3.3.5
Merge branch '3.3.5' of https://github.com/britus/TrinityCore.EoF.Fixes.git into 3.3.5