avions end end end
Merge remote-tracking branch 'origin/MAJ-2.5.0' into MAJ-2.5.0

Conflicts:
	Altis_Life_Aurore.Altis/mission.sqm