Again, this is still python 3, need to encode bytes to str
Merge remote-tracking branch 'parent/py3' into py3