Merge branch 'maint-0.2.5' into maint-0.2.6