Update with changes done on the branch ORCHIDEE-CN between revision 3238 to 5638. Find more information in ticket #530
SL, JG