Moved "pour faire court"
Merge branch 'master' into gh-pages