Local work on branch1/amend
Merge remote-tracking branch 'origin/master' into branch1