12216: Merge branch 'master' into 12216-webdav-list
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Oct 2017 17:55:54 +0000 (13:55 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Oct 2017 17:55:54 +0000 (13:55 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge