Merge branch 'bug2279' into maint-0.2.2