Merge branch 'master' of /home/antoine/MiCorr with conflicts.