XML elements don’t support context managers in Py2.7
Rename variables for consistency
Merge remote-tracking branch 'origin/python2.7'