Merge branch 'bug1810' into maint-0.2.2