fix tinyxml2
Merge branch 'fix_tinyxml2'