Merge branch 'maint-0.2.8' into maint-0.2.9