Correction bug
Merge branch 'master' into chevauchementConvoyeurs