Merge branch 'master' into 6518-crunch2-dispatch-slurm
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Mar 2016 00:02:30 +0000 (20:02 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Mar 2016 00:02:30 +0000 (20:02 -0400)

Trivial merge