Merge commit 'mikeperry/bug1740' into maint-0.2.2