Workers timeout gracefully
Merge pull request #1123 from brooksryba/develop

Develop