bugfixes needed for Issue #90
Merge branch 'master' into pharo3.0_dev

bugfixes needed for Issue #90