Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Wed, 2 Sep 2020 16:25:52 +0000 (12:25 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 2 Sep 2020 16:25:52 +0000 (12:25 -0400)

Trivial merge