Merge branch 'bugfix/issue1' into release/1.0
Fixed issue 2
Merge branch 'bugfix/issue2'