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