Merged commit [7768] done in ORCHIDEE_3 into the trunk. This is actually a correction on previous commit.