Imported Debian patch 5.1.5-7
Merge tag 'debian/5.1.5-7'

Debian release 5.1.5-7