I did another merge today, and again it went pretty smoothly. 6 conflicts, and only 2 that required any human intervention. Jiri: please check the UI buttons relating to metaballs (in particular, those related to hiding stuff). Chris