JC-1395 Fixed displaying usernames with javascript in it.
Merge remote-tracking branch 'origin/master'