Be more cautious when handling binary responses
Quick hack to enable retries for requests that are idempotent in out API
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix issue #152: catch SocketTimeoutException
  fix getUrlWithQueryString