Fix rebase onto master.