Set version to 1.0
Merge branch 'v1' into v2
Set version to 2.0