Merge branch 'master' into bs
authorJoey Hess <joeyh@joeyh.name>
Thu, 5 Dec 2019 15:41:30 +0000 (11:41 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 5 Dec 2019 15:41:30 +0000 (11:41 -0400)

Trivial merge