Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 16 Jun 2020 02:35:40 +0000 (20:35 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 16 Jun 2020 02:35:40 +0000 (20:35 -0600)

Trivial merge