Merge branch 'maint-0.2.6' into maint-0.2.7