From: Ward Vandewege <ward@curii.com>
Date: Thu, 8 Oct 2020 01:24:28 +0000 (-0400)
Subject: Merge branch '16955-more-fixes' into master
X-Git-Tag: 2.1.0~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8109f3ba459c2fed2111fb72523637fa12b40ffc

Merge branch '16955-more-fixes' into master

refs #16955

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

8109f3ba459c2fed2111fb72523637fa12b40ffc