modif 17-06 2
Merge origin/master