Update the master branch with the changes from the upstream repository