Bump version to 3.1.0
Merge branch 'release/3.1.0'
Merge tag '3.1.0' into develop

3.1.0