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)
commit98911cfe4792b20798858cefb353c451460e1a80
tree8252d2957c976c45e83c38660a2b13f088cf16b0
parentfd95e7a933b1534b76e4820838e278595b4e1220
parentb1160af572bfcaeb6f0c1bab5b08987312a92814
13111: Merge branch 'master' into 13111-webdav-projects

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>