Merge branch 'ws/curl-http-proxy-over-https'