Rebase against upstream changes