Refer to remotes/upstream/master to avoid ambiguity with local upstream/master branch