13959: Merge branch 'master' into 13959-timeouts-and-logging
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 21 Aug 2018 16:51:22 +0000 (12:51 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 21 Aug 2018 16:51:22 +0000 (12:51 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge