Commit du vendredi, k ciao.
Merge remote-tracking branch 'origin/master'