BUFGFIX: Use the platform specific modifier for keyboard shortcuts.
fix merge conflict