Merge branch 'maint-0.3.0' into maint-0.3.1