Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 22 Oct 2020 22:20:30 +0000 (16:20 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 22 Oct 2020 22:20:30 +0000 (16:20 -0600)

Trivial merge