commit de David Vargas: B16844
Merge branch 'master' into test1