Merge branch 'master' into dhcp-client