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