xml support
Merge branch 'master' into xml_support
Merge remote-tracking branch 'origin/xml_support'