Merge branch 'dhcpv6'