Menu addition
Merge branch 'master' into philippe-branch