More graceful timeouts
Graceful timeouts
Merge branch 't'