Imported Debian patch 5.09-2ubuntu0.5
Merge tag 'debian/5.09-2ubuntu0.5'

Debian release 5.09-2ubuntu0.5