Adding timeout to ClientOptions for Faraday.
Merge branch 'master' into version2