Imported Debian patch 2.15-0ubuntu10.6