Merge pull request #1168 from Lukasa/freeze

Feature freeze.
Merge pull request #1162 from Lukasa/proxy_auth

Proxy Authorization Headers
Guard against users sending unprepared requests.