Merge remote-tracking branch 'origin/master' into 3988-crunch-use-job-state
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 24 Sep 2014 18:21:50 +0000 (14:21 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 24 Sep 2014 18:21:50 +0000 (14:21 -0400)

Trivial merge