Merge branch 'bug1751_enabling' into maint-0.2.2