comment br1
Merge branch 'master' into br2

This merge IS necessary