No longer run htmlspecialchars() on language strings
Set user_name template variable
Merge remote-tracking branch 'upstream/master'