Merge "Change edit shortcut from 'm' to 'e'" into stable-2.11