Index: wp-includes/vars.php
===================================================================
--- wp-includes/vars.php	(revision 33482)
+++ wp-includes/vars.php	(working copy)
@@ -16,7 +16,7 @@
  */
 
 global $pagenow,
-	$is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE,
+	$is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, $is_Edge,
 	$is_apache, $is_IIS, $is_iis7, $is_nginx;
 
 // On which page are we ?
@@ -48,12 +48,12 @@
 unset($self_matches);
 
 // Simple browser detection
-$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = false;
+$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_edge = $is_iphone = false;
 
 if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
 	if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
 		$is_lynx = true;
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
+	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') != true ) {
 		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
 			$is_admin = is_admin();
 			/**
@@ -69,18 +69,20 @@
 		} else {
 			$is_chrome = true;
 		}
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') != true ) {
 		$is_safari = true;
 	} elseif ( ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false ) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
 		$is_winIE = true;
 	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
 		$is_macIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') != true ) {
 		$is_gecko = true;
 	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
 		$is_opera = true;
 	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
 		$is_NS4 = true;
+	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false ) {
+		$is_edge = true;
 	}
 }