Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(revision 31703)
+++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(working copy)
@@ -4,8 +4,11 @@
 tinymce.ui.FloatPanel.zIndex = 100100;
 
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
-	var DOM = tinymce.DOM, wpAdvButton, modKey, style,
-		last = 0;
+	var DOM = tinymce.DOM,
+		each = tinymce.each,
+		last = 0,
+		wpAdvButton,
+		style;
 
 	if ( typeof window.jQuery !== 'undefined' ) {
 		window.jQuery( document ).triggerHandler( 'tinymce-editor-setup', [ editor ] );
@@ -29,7 +32,7 @@
 			state = 'hide';
 		}
 
-		tinymce.each( toolbars, function( toolbar, i ) {
+		each( toolbars, function( toolbar, i ) {
 			if ( i > 0 ) {
 				if ( state === 'hide' ) {
 					toolbar.hide();
@@ -309,7 +312,7 @@
 
 		bodyClass.push('wp-editor');
 
-		tinymce.each( bodyClass, function( cls ) {
+		each( bodyClass, function( cls ) {
 			if ( cls ) {
 				dom.addClass( doc.body, cls );
 			}
@@ -351,7 +354,7 @@
 
 			editor.on( 'PastePostProcess', function( event ) {
 				// Remove empty paragraphs
-				tinymce.each( dom.select( 'p', event.node ), function( node ) {
+				each( dom.select( 'p', event.node ), function( node ) {
 					if ( dom.isEmpty( node ) ) {
 						dom.remove( node );
 					}
@@ -408,25 +411,27 @@
 		}
 	});
 
-	// Add custom shortcuts
-	modKey = 'alt+shift';
+	each( {
+		c: 'JustifyCenter',
+		r: 'JustifyRight',
+		l: 'JustifyLeft',
+		j: 'JustifyFull',
+		q: 'mceBlockQuote',
+		u: 'InsertUnorderedList',
+		o: 'InsertOrderedList',
+		n: 'mceSpellCheck',
+		s: 'unlink',
+		m: 'WP_Medialib',
+		z: 'WP_Adv',
+		t: 'WP_More',
+		d: 'Strikethrough',
+		h: 'WP_Help',
+		p: 'WP_Page',
+		x: 'WP_Code'
+	}, function( command, key ) {
+		editor.addShortcut( 'access+' + key, '', command );
+	} );
 
-	editor.addShortcut( modKey + '+c', '', 'JustifyCenter' );
-	editor.addShortcut( modKey + '+r', '', 'JustifyRight' );
-	editor.addShortcut( modKey + '+l', '', 'JustifyLeft' );
-	editor.addShortcut( modKey + '+j', '', 'JustifyFull' );
-	editor.addShortcut( modKey + '+q', '', 'mceBlockQuote' );
-	editor.addShortcut( modKey + '+u', '', 'InsertUnorderedList' );
-	editor.addShortcut( modKey + '+o', '', 'InsertOrderedList' );
-	editor.addShortcut( modKey + '+n', '', 'mceSpellCheck' );
-	editor.addShortcut( modKey + '+s', '', 'unlink' );
-	editor.addShortcut( modKey + '+m', '', 'WP_Medialib' );
-	editor.addShortcut( modKey + '+z', '', 'WP_Adv' );
-	editor.addShortcut( modKey + '+t', '', 'WP_More' );
-	editor.addShortcut( modKey + '+d', '', 'Strikethrough' );
-	editor.addShortcut( modKey + '+h', '', 'WP_Help' );
-	editor.addShortcut( modKey + '+p', '', 'WP_Page' );
-	editor.addShortcut( modKey + '+x', '', 'WP_Code' );
 	editor.addShortcut( 'ctrl+s', '', function() {
 		if ( typeof wp !== 'undefined' && wp.autosave ) {
 			wp.autosave.server.triggerSave();
Index: src/wp-includes/js/tinymce/plugins/wplink/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wplink/plugin.js	(revision 31703)
+++ src/wp-includes/js/tinymce/plugins/wplink/plugin.js	(working copy)
@@ -1,6 +1,7 @@
 /* global tinymce */
 tinymce.PluginManager.add( 'wplink', function( editor ) {
-	var linkButton;
+	var shortcut = 'meta+k',
+		linkButton;
 
 	// Register a command so that it can be invoked by using tinyMCE.activeEditor.execCommand( 'WP_Link' );
 	editor.addCommand( 'WP_Link', function() {
@@ -9,10 +10,7 @@
 		}
 	});
 
-	// WP default shortcut
-	editor.addShortcut( 'alt+shift+a', '', 'WP_Link' );
-	// The "de-facto standard" shortcut, see #27305
-	editor.addShortcut( 'ctrl+k', '', 'WP_Link' );
+	editor.addShortcut( shortcut, '', 'WP_Link' );
 
 	function setState( button, node ) {
 		var parent = editor.dom.getParent( node, 'a' ),
@@ -25,7 +23,7 @@
 	editor.addButton( 'link', {
 		icon: 'link',
 		tooltip: 'Insert/edit link',
-		shortcut: 'Alt+Shift+A',
+		shortcut: shortcut,
 		cmd: 'WP_Link',
 
 		onPostRender: function() {
@@ -53,8 +51,8 @@
 
 	editor.addMenuItem( 'link', {
 		icon: 'link',
-		text: 'Insert link',
-		shortcut: 'Alt+Shift+A',
+		text: 'Insert/edit link',
+		shortcut: shortcut,
 		cmd: 'WP_Link',
 		stateSelector: 'a[href]',
 		context: 'insert',