Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Mon, 5 Oct 2020 18:37:33 +0000 (14:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 5 Oct 2020 18:37:33 +0000 (14:37 -0400)

Trivial merge