Making everything more tolerant of network pauses
Merge remote-tracking branch 'origin/master'