[fr] Chapter 3 - updating merge infos
Authored by: chris-nanteuil 2016-11-13
Parent: [r5223]
Child: [r5225]