Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 22 Dec 2017 02:07:13 +0000 (19:07 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Dec 2017 02:07:13 +0000 (19:07 -0700)

Trivial merge