Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Mon, 28 Aug 2017 18:05:57 +0000 (12:05 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 28 Aug 2017 18:05:57 +0000 (12:05 -0600)

Trivial merge