UKMO/nemo_v3_6_STABLE_copy branch : commit changes from nemo_v3_6_STABLE branch up to latest revision.