Imported Debian patch 2.15-0ubuntu10.7
Merge tag 'debian/2.15-0ubuntu10.7'

Debian release 2.15-0ubuntu10.7