Merge pull request #12930 from achillesrasquinha/py3-fixes

Py3 fixes