3.2 version bump
Merge branch 'release/3.2' into develop