Merge: from revisions [4491:4695/trunk/ORCHIDEE]
Merge done in [4671:4718/perso/albert.jornet/MICT_MERGE]