Merge branch 'maint-0.3.2' into maint-0.3.3