Merge branch 'dhcpd' into next