Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine