Merge tinyxml2 to recent release