Merge branch 'pharo2.0_dev' into pharo2.0