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