Merge pull request #1181 from ryzhovau/ipv6_opt