Imported Debian patch 3.1.10-2