14325: Merge branch 'master'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 1 Feb 2019 21:29:17 +0000 (16:29 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 1 Feb 2019 21:29:17 +0000 (16:29 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge