Merge branch 'master' into 12107-faster-git
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Sep 2017 18:33:36 +0000 (14:33 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Sep 2017 18:33:36 +0000 (14:33 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge