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