Merged in changes from https://github.com/galenide/https-everywhere.