merged fix for #912 from 0.10 to trunk (turned out it was not broken in trunk but i merged the patch & testcase anyway. Other refactorings.