Merge branch 'release/3.1' into develop
Fix typo.
Bump version to 3.2
Merge branch 'release/3.2'