14806: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 5 Feb 2019 15:41:31 +0000 (10:41 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 5 Feb 2019 15:41:31 +0000 (10:41 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge