Imported Upstream version 1.6.1+dfsg
Merge new version 1.6.1+dfsg-1.
d/changelog: Update for new version.