Merge branch 'master', remote branch 'upstream/master'
Merge from upstream
Merge
Update from bare
bare