Merge branch 'maint-0.2.6' into release-0.2.6