Index: src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(revision 35600)
+++ src/wp-includes/js/tinymce/plugins/wordpress/plugin.js	(working copy)
@@ -534,6 +534,7 @@
 			u: 'InsertUnorderedList',
 			o: 'InsertOrderedList',
 			s: 'unlink',
+			a: 'WP_Link',
 			m: 'WP_Medialib',
 			z: 'WP_Adv',
 			t: 'WP_More',
Index: src/wp-includes/media.php
===================================================================
--- src/wp-includes/media.php	(revision 35600)
+++ src/wp-includes/media.php	(working copy)
@@ -1089,7 +1089,6 @@
 	 * @param string $image_src     The 'src' of the image.
 	 * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
  	 * @param int    $attachment_id Image attachment ID.
-
 	 */
 	$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );