Merge branch 'maint-0.3.5'