Merge branch 'release/3.0' into develop
Update documentation.
Bumb to 3.1
Merge branch 'release/3.1'