Replace Alt with Meta to see if it works on Mac
Merge branch 'master' into tentative-changes