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