Don't let proxy_bypass bring you down.
Merge pull request #1845 from Lukasa/proxy_bypass

Resolve proxy_bypass problems.