Merge change I8cd9a083

* changes:
  Fix KXmlSerializer so it won't generate invalid XML.