Merge dpkg (1.18.18) import into refs/heads/workingbranch
authorGuillem Jover <guillem@debian.org>
Tue, 20 Dec 2016 12:53:12 +0000 (12:53 +0000)
committerGuillem Jover <guillem@debian.org>
Tue, 20 Dec 2016 12:53:12 +0000 (12:53 +0000)

Trivial merge