Imported Debian patch 1.0.10-6~quilt.7