Merge branch 'ipv6_harder', remote-tracking branch 'origin/ipv6_harder' into ipv6_harder