Merge branch 'release/v1.0'
...
Merge branch 'develop'