Imported Debian patch 1.8.7.352-2ubuntu1.6
Merge tag 'debian/1.8.7.352-2ubuntu1.6'

Debian release 1.8.7.352-2ubuntu1.6