Merge "Switch from inet_pton to getaddrinfo"