Imported Debian patch 2.7.6-7