Imported Debian patch 1.8.3p1-1ubuntu3.6