Merge "Allow more proxy bypass patterns"