Imported Debian patch 5.4.3~dfsg-2.4ubuntu1.2
Merge branch 'debian' - upgrade to latest upstream release.