petits modifications
Merge origin/Trunk into Trunk