Imported Debian patch 4.2-2ubuntu2.5
Imported Debian patch 4.2-2ubuntu2.6