Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:02:00 +0000 (10:02 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:02:00 +0000 (10:02 -0600)

Trivial merge