Added XML helper class.
Added XML helper class.
Changed a few attributes to tags, use safer way of writing XML.
Use safer way of writing XML.
Bumped XML format version.
Merge branch 'issue/bug-2205'.

This commit fixes #2205.