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

3.1.1