Bump version number
Merge branch 'release/3.1.0'