Update version to 3.1
Merge pull request #1768 from mahagr/develop

Update version to 3.1