bumping version to 3.1.1
Merge branch 'hotfix-3.1.1' into develop