Merge branch 'master' into 13990-collection-files-service-based-on-webdav
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 14 Aug 2018 09:56:59 +0000 (11:56 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 14 Aug 2018 09:56:59 +0000 (11:56 +0200)
refs #13990

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>


Trivial merge