Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 9 Oct 2018 03:01:07 +0000 (21:01 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 9 Oct 2018 03:01:07 +0000 (21:01 -0600)

Trivial merge