Merge branch 'ipv6-sticky-pktinfo'