Merge branch 'maint-0.2.7' into maint-0.2.8