Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 30 Sep 2020 06:19:12 +0000 (00:19 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 30 Sep 2020 06:19:12 +0000 (00:19 -0600)

Trivial merge