Imported Debian patch 1.4.18-1ubuntu1.6