Merge "Correctly parse IP:Port nameserver pairs"