[Pharo-project] Merging one-click and pharo-dev