Merge dpkg (1.18.22) import into refs/heads/workingbranch
authorGuillem Jover <guillem@debian.org>
Wed, 1 Feb 2017 04:48:58 +0000 (04:48 +0000)
committerGuillem Jover <guillem@debian.org>
Wed, 1 Feb 2017 04:48:58 +0000 (04:48 +0000)

Trivial merge