Merge pull request #965 from cshore-firmware/pull-request-odhcpd-mac