Rebase against current master