Merge branch 'branch-1.7' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 25 Apr 2017 00:22:03 +0000 (18:22 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 25 Apr 2017 00:22:03 +0000 (18:22 -0600)

Trivial merge