Bump version
Merge branch 'release/3.1.1'