Patches taken from: * f292beac11/debian/patches/import-merge-without-userid
f292beac11/debian/patches/import-merge-without-userid