Merge branch 'maint-0.2.4' into maint-0.2.5