Imported Debian patch 7.32.3-1