Fix ipv6 on windows
Merge remote-tracking branch 'upstream/master' into math2