Merge branch 'master', remote-tracking branch 'remotes/upstream/master'