same as PR 93

this is PR 93 against the 0.9 relbranch