057
Merge branch '30' of github.com:pharo-project/pharo-update into 30

Conflicts:
	updates30.staged