Bump to version 3.
Merge branch 'release/2.0' into develop