Imported patch from debian/patches into upstream
Imported patch from debian/patches