Second time on branch with changes
Merge branch 'master' into branch1-master

added some more stuff here.
Merge branch 'branch1-master'

* branch1-master:
  Second time on branch with changes