upstream-fixes.diff
