[Pharo-project] Merging 6834