13493: Merge branch 'master' into 13493-federation-proxy
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Jul 2018 14:25:45 +0000 (10:25 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Jul 2018 14:25:45 +0000 (10:25 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge