13100: Merge branch 'master' into 13100-crunch-run-output
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 9 Apr 2018 20:22:33 +0000 (16:22 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 9 Apr 2018 20:22:33 +0000 (16:22 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge