diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-includes/js/tinymce/wp-tinymce.php
--- a/wp/wp-includes/js/tinymce/wp-tinymce.php	Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/js/tinymce/wp-tinymce.php	Tue Jun 09 03:35:32 2015 +0200
@@ -2,7 +2,7 @@
 /**
  * Disable error reporting
  *
- * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ * Set this to error_reporting( -1 ) for debugging.
  */
 error_reporting(0);
 
@@ -21,7 +21,7 @@
 
 $expires_offset = 31536000; // 1 year
 
-header('Content-Type: application/x-javascript; charset=UTF-8');
+header('Content-Type: application/javascript; charset=UTF-8');
 header('Vary: Accept-Encoding'); // Handle proxies
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
@@ -32,7 +32,8 @@
 	header('Content-Encoding: gzip');
 	echo $file;
 } else {
-	echo get_file($basepath . '/tiny_mce.js');
-	echo get_file($basepath . '/wp-tinymce-schema.js');
+	// Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
+	echo get_file( $basepath . '/tinymce.min.js' );
+	echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
 }
 exit;