version bump
Merge branch 'release/31' into develop