Rebase on the master branch.

But the rebasing proved difficult, so instead branch from the master
branch and checkout just the changed files.