Imported Debian patch 2.10-1ubuntu1.2
Merge tag 'debian/2.10-1ubuntu1.2'

Debian release 2.10-1ubuntu1.2