Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:13:12 +0000 (18:13 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:13:12 +0000 (18:13 -0600)

Trivial merge