Merging debian/patches

Merged debian/patches from debian