Core/Chat: Fixed merge error
Merge remote-tracking branch 'Trinity/4.3.4' into 4.3.4