Merge branch '9528-slurm-parsable'
authorTom Clegg <tom@curoverse.com>
Thu, 7 Jul 2016 15:23:59 +0000 (11:23 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 7 Jul 2016 15:23:59 +0000 (11:23 -0400)
closes #9528


Trivial merge