Merge pull request #3139 from akoeplinger/dns-test