Merge pull request #2554 from castillofrancodamian/https_dns_proxy