Rebase against master once more