Merge branch 'bug2331' into maint-0.2.2