Merge branch 'master' into performances_synchro
Merge branch 'master' into multi_user