Merge pull request #5095 from jow-/dhcpv6-rework