Merge pull request #1553 from wvanlint/dns_hostname