Imported Debian patch 4.2-2ubuntu2.3