Imported Debian patch 1.0.1h-2
Merge tag 'debian/1.0.1h-2'

Debian release 1.0.1h-2