Merge branch 'maint-0.2.8' into release-0.2.8