Merge branch 'xml-testing'
Merge branch 'travis'