Imported Debian patch 2.7.1-3
Merge tag 'debian/2.7.1-3'

Debian release 2.7.1-3