> We need to rebase off the updated master.

... why? This branch forked from master only two weeks ago.