Rebase against master branch