merge patched-debian into debian