Merge "Fix connection timeouts in URL downloader"