Merge branch 'maint-0.3.3' into release-0.3.3