Bump version to 3.1
Merge branch 'release/test-tags' into develop