Automatically determine which ip version to use
Merge remote-tracking branch 'parent/py3' into py3