Merge branch 'master' into compact_xml