Imported Debian patch 2:1.11.4-0ubuntu10.1