Merge: from trunk revisions [3643:3883/trunk/ORCHIDEE]
Done in [3887:3922/perso/albert.jornet/MICT-MERGING]