Escaping some outputs to prevent or cause XSS to be more difficult.
Merge branch 'escape_xss'