fix new test in Py2.[45]
merge 0.18.x branch into master