Backport devel/gob2 fix from trunk.
Backport textproc/tinyxml fix from trunk.