Merge pull request #1695 from dibdot/regex-dhcphost