`wdemeuter' as titular and instructor
Merge remote-tracking branch 'origin/master' into nilsbranch
`tjdhondt' added too
Merge remote-tracking branch 'origin/youssefbranch' into youssefbranch