13497: Merge branch 'master' into 13497-controller
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 11 Jul 2018 19:19:55 +0000 (15:19 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 11 Jul 2018 19:19:55 +0000 (15:19 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge