Merge pull request #4745 from xmcclure/ipv6-cleanup