Merge branch '4012-crunch-job-api-retries-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 7 Oct 2014 13:44:15 +0000 (09:44 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 7 Oct 2014 13:44:29 +0000 (09:44 -0400)
Closes #4012.


Trivial merge