Imported Debian patch 7.1.614-1