Imported Debian patch 2.7.8.dfsg-5.1ubuntu4.11