Merge branch 'maint-0.3.3' into maint-0.3.4