Merge branch 'bug1772' into maint-0.2.2