fix Issue #40
Merge branch 'gemstone2.4' into issue_34