Correctly rebase against master.