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