Change master branch to follow upstream exactly for easier pull requests