Imported Debian patch 2.2.22-1ubuntu1.4
Merge branch 'debian'