improved timeouts for downloads, closes #2291