I'm guessing that all this was just moved around rather than changed.  Did the merge/rebase with master go okay?