Mod: basic support to make twip work with Python3
Merge remote-tracking branch 'upstream/master'