Merge branch '2e-ligne'