diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
index 8cbfef5173..642db87137 100644
Binary files a/wp-includes/js/tinymce/wp-tinymce.js.gz and b/wp-includes/js/tinymce/wp-tinymce.js.gz differ
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index eab50c9098..6330af2604 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -190,8 +190,8 @@ function wp_delete_nav_menu( $menu ) {
 	$result = wp_delete_term( $menu->term_id, 'nav_menu' );
 
 	// Remove this menu from any locations.
-	$locations = get_theme_mod( 'nav_menu_locations' );
-	foreach ( (array) $locations as $location => $menu_id ) {
+	$locations = get_nav_menu_locations();
+	foreach ( $locations as $location => $menu_id ) {
 		if ( $menu_id == $menu->term_id )
 			$locations[ $location ] = 0;
 	}