Updated version 2.20 from 'upstream/2.20'
authorBdale Garbee <bdale@gag.com>
Mon, 12 Dec 2016 23:05:30 +0000 (16:05 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 12 Dec 2016 23:05:30 +0000 (16:05 -0700)
with Debian dir c642cf27ba124753f3749d68584a8d4f7bdc0f9b


Trivial merge