Adds some output encoding to remove XSS vulns
Merge commit 'ef4784681e9a4ae85de995834070c5481cf4153c' into HEAD