Bump to version 2
Merge branch 'release/2' into develop