Commit #1 in another-feature
Merge branch 'master' into some-feature