Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 03:01:35 +0000 (21:01 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 03:01:35 +0000 (21:01 -0600)

Trivial merge