Merge branch 'sb/spartan-gant' of git.unicaen.fr:open-source/oscar into sb/spartan-gant