Prepare v1.3.0

These are a few commits cherry-picked form `master` after the `okhttp_1x` branch was made that I think should be included.

Let me know what you think and if there are any that should be added or removed. List is [here](https://github.com/square/okhttp/compare/okhttp_1x...master).