Update: Use xml-escape instead of inline helper (Ref #848)
Merge pull request #1096 from jrajav/xmlescape

Update: Use xml-escape instead of inline helper