Check both curl and wget
Merge remote-tracking branch 'origin/curlfix'