Merge branch 'bug2328_021' into maint-0.2.1