Imported Debian patch 2.2.0.3-1.1ubuntu5.14.04