added an xmlwriter
Merge remote-tracking branch 'upstream/master' into fix-xmlwriter
reapply xmnls fix
Merge branch 'new-fix-xml'
Merge branch 'fix-xmlwriter'