Menu addition
Merge branch 'master' into philippe-branch
Merge remote-tracking branch 'origin/master' into jonathan-branch