Rebase this branch

Here it is.