Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Tue, 1 Sep 2020 19:36:56 +0000 (15:36 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 1 Sep 2020 19:36:56 +0000 (15:36 -0400)

Trivial merge