Merge branch 'maint-0.3.5' into maint-0.4.4