Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2018 23:52:22 +0000 (17:52 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 8 Oct 2018 23:52:22 +0000 (17:52 -0600)

Trivial merge