Imported Debian patch 1.6.1-1
Merge branch 'debian'