Py2.5 test fix
merge 0.19.x branch into master