Merge: from [5432/trunk/ORCHIDEE] and [5431/trunk/ORCHIDEE]. Related to Irene HPC.
Check for the previous commit.