Fix the alt-enter mapping
Merge branch 'master' into my-rpi