Imported Debian patch 2.12.14-5ubuntu3.7