Merge with Pharo

Conflicts:
	Spec-Core.package/monticello.meta/version