Merge pull request #6711 from systemcrash/dns_nitpick