gh-115 : fixed issue with strings that do not blend well with XML
Merge branch 'pu' into next