Merge branch 'release-3.2'
Merge release candidate 3.2.1
Merge branch 'master' into develop