* Ely: tinyxml2 update.
Merge branch 'master' into ubuntu