Alex/okpatch

OkHttp change is at https://github.com/lxdvs/okhttp/commit/b1a6a735bb8da3f6dcf65369604882e35f6f8742