Merge branch 'maint-0.2.4'