Imported Debian patch 0.2.0-1