13111: Merge branch 'master' into 13111-webdav-projects
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 13 Apr 2018 20:49:27 +0000 (16:49 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 13 Apr 2018 20:49:27 +0000 (16:49 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge