Changed: Swapped Kevin and Cedric at 10h15
Merge branch 'master' into gh-pages