Merge branch 'bs'
authorJoey Hess <joeyh@joeyh.name>
Thu, 19 Dec 2019 17:12:39 +0000 (13:12 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 19 Dec 2019 17:12:39 +0000 (13:12 -0400)

Trivial merge