upstream_45.diff
