Merge: from revisions [4609:4695/trunk/ORCHIDEE].
This is done in [4709:4716/perso/albert.jornet/ORCHIDEE-CN-P]