16833: Merge branch 'master' into 16833-replace-epydoc
authorWard Vandewege <ward@curii.com>
Wed, 16 Sep 2020 20:00:07 +0000 (16:00 -0400)
committerWard Vandewege <ward@curii.com>
Wed, 16 Sep 2020 20:00:24 +0000 (16:00 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>


Trivial merge