Imported Debian patch 1.3.1-1