Master is in an inconsistent state due to me accidentally having pulled in a merge commit, and I'm looking at how to restore it. If you rebase onto master now we will end up in a mess again.