Merge "Add a client for querying nameservers"