Rebase on renamed master