Merge "Allow underscore in proxy hostnames"