Improve XML retrieval and parsing for newer versions of python
Merge branch 'etree' into working