merge with Flavien
fix confict Adrien/Flavien - adrien
Merge branch 'master' into dvms2