Merging with Edouard's modifications

2011-11-08, laurent