Turned on auto escaping of XML-unfriendly characters.
Merge remote-tracking branch 'origin/master'