Merge pull request #2126 from rosysong/ipv6