Merge branch 'foo'
Merge branch 'master' into foo