Merge pull request #680 from cshore/pull-request-dnsmasq-options