Merge branch 'master' into 12033-multisite-search
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 18 Aug 2017 19:54:20 +0000 (15:54 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 18 Aug 2017 19:54:20 +0000 (15:54 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge