Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 5 Aug 2018 03:24:13 +0000 (11:24 +0800)
committerBdale Garbee <bdale@gag.com>
Sun, 5 Aug 2018 03:24:13 +0000 (11:24 +0800)

Trivial merge