Merge branch '10470-slurm-error'
authorTom Clegg <tom@curoverse.com>
Fri, 18 Nov 2016 20:14:47 +0000 (15:14 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 18 Nov 2016 20:14:47 +0000 (15:14 -0500)
refs #10470


Trivial merge