diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 7f6217dedf..3972b30621 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -675,13 +675,15 @@ function remove_all_actions($tag, $priority = false) {
 function plugin_basename( $file ) {
 	global $wp_plugin_paths;
 
+	// $wp_plugin_paths contains normalized paths.
+	$file = wp_normalize_path( $file );
+
 	foreach ( $wp_plugin_paths as $dir => $realdir ) {
 		if ( strpos( $file, $realdir ) === 0 ) {
 			$file = $dir . substr( $file, strlen( $realdir ) );
 		}
 	}
 
-	$file = wp_normalize_path( $file );
 	$plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b5a1a32936..0dd5cc46e4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37331';
+$wp_version = '4.6-alpha-37332';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.