Update version to 3.3.2
Merge branch 'dev/mspaulding/3.3.2' into maint/3.3/testing