From: Tom Clegg <tom@curoverse.com>
Date: Tue, 6 Jun 2017 17:53:36 +0000 (-0400)
Subject: 11652: Merge branch 'master' into 11652-recursive-contents
X-Git-Tag: 1.1.0~211^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/29665e2d9a543bffb237d148c3484c03b03e30aa

11652: Merge branch 'master' into 11652-recursive-contents
---

29665e2d9a543bffb237d148c3484c03b03e30aa