diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index e01b0e2fe4..73b59fd3c1 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -731,6 +731,7 @@ function plugin_basename( $file ) {
 	// $wp_plugin_paths contains normalized paths.
 	$file = wp_normalize_path( $file );
 
+	arsort( $wp_plugin_paths );
 	foreach ( $wp_plugin_paths as $dir => $realdir ) {
 		if ( strpos( $file, $realdir ) === 0 ) {
 			$file = $dir . substr( $file, strlen( $realdir ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 904a5522d0..33c5543fc7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta1-37982';
+$wp_version = '4.6-beta1-37983';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.