yet another Py2.5 fix
merge 0.19.x branch into master