Imported Debian patch 1.0.10-5