Imported Debian patch 1.8.7.352-2ubuntu1.6