goes with previous commit from June 14th (general updates...) (Laurent)