Imported Debian patch 2.10-1ubuntu1.2