Bar2 (resolve)
Merge branch 'master' into bar
Merge branch 'master' into bar