diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 5db7e4adcf..73b9de8d5f 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1005,10 +1005,8 @@ function do_feed() {
 		$feed = get_default_feed();
 
 	$hook = 'do_feed_' . $feed;
-	if ( !has_action($hook) ) {
-		$message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
-		wp_die( $message, '', array( 'response' => 404 ) );
-	}
+	if ( ! has_action( $hook ) )
+		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
 
 	do_action( $hook, $wp_query->is_comment_feed );
 }
diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
index f4a3d2ebfb..67e6a72d79 100644
Binary files a/wp-includes/js/tinymce/wp-tinymce.js.gz and b/wp-includes/js/tinymce/wp-tinymce.js.gz differ