Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 12 Aug 2017 04:59:03 +0000 (00:59 -0400)
committerBdale Garbee <bdale@gag.com>
Sat, 12 Aug 2017 04:59:03 +0000 (00:59 -0400)

Trivial merge