Merge "Py3: Finish the python3 port"