Version bump
Updated changelog
Merge branch 'release/3.1' into develop