Added old tiny xml patch to the new patch.
Merge branch 'bug-18405-TinyXMLPatch'