Imported Debian patch 5.09-2ubuntu0.3
Merge branch 'debian' - new upstream version.