Merge branch 'maint-0.3.4' into maint-0.3.5