Merge branch 'maint-0.3.4' into release-0.3.4