Fixed epic git rebase meltdown.  No new features.