Increment version
Merge branch 'release/v3.1.1-4' into develop