15003: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 31 May 2019 17:54:10 +0000 (13:54 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 31 May 2019 17:54:10 +0000 (13:54 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge