Merge branch 'maint-0.2.9' into maint-0.3.2