Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 3 Jul 2020 02:22:05 +0000 (20:22 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 3 Jul 2020 02:22:05 +0000 (20:22 -0600)

Trivial merge