fix curl timeout
Merge branch 'upstream/3.0'