Merge branch 'maint-0.3.5' into release-0.3.5