Merge branch 'master' into 1.0-Traduction
Merge branch '1.0-Traduction'