Merge branch 'bug2409' into maint-0.2.2