Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 3 Jan 2019 06:04:43 +0000 (23:04 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 3 Jan 2019 06:04:43 +0000 (23:04 -0700)

Trivial merge