Upgrade to tinyxml2 from ASG