Merge branch 'maint-0.2.5' into release-0.2.5