Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2