Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 6 Dec 2019 05:45:10 +0000 (22:45 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 6 Dec 2019 05:45:10 +0000 (22:45 -0700)

Trivial merge