14807: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 20 Mar 2019 19:20:57 +0000 (15:20 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 20 Mar 2019 19:20:57 +0000 (15:20 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge