Merge branch 'maint-0.3.2' into release-0.3.2