Merge branch 'xml-fixes' of https://github.com/myeisha/mono into myeisha-xml-fixes