Merge branch '10790-crunch-job-log-timeout' refs #10790
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 30 Dec 2016 21:12:35 +0000 (16:12 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 30 Dec 2016 21:12:35 +0000 (16:12 -0500)

Trivial merge