* merged from Christian Perrier: