Imported Debian patch 0.2.10-1.1