Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:48:32 +0000 (23:48 +0200)
committerBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:48:32 +0000 (23:48 +0200)

Trivial merge