Merge remote-tracking branch 'upstream/master' into retry_params
add helper functions and comment
Merge remote-tracking branch 'origin/retry_params' into hackney