Merge branch 'maint-0.2.4' into release-0.2.4