``Rebase'' on upstream