Merge branch 'master' into 14885-ciso-and-conda-packaging-pr
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Wed, 27 Feb 2019 19:24:58 +0000 (14:24 -0500)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Wed, 27 Feb 2019 19:24:58 +0000 (14:24 -0500)
refs #14885

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>


Trivial merge