Merge change I52b6299c

* changes:
  Sanitize text before emitting to XML.