Fix tests on python 3.2+, 2to3 appears to be mangling this local variable
Merge branch 'PYTHON-436' into PYTHON-512
Merge branch 'PYTHON-512'