Py3 fix
merge branch 0.19.x