abstract hostname so can use proxy for testing timeouts
retry once on network error
Merge branch 'lastobelus-retry_on_error'
1.4.3