Merge branch 'master' of github.com:leethomason/tinyxml2