Escape double-quote in changelog XML
Merge branch 'release' into upstream