Make downloading more robust
Make downloads more robust
Merge remote-tracking branch 'origin/master'