diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index 7e3e7f7e2d..cdb1cf8e98 100644
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -748,7 +748,7 @@ function wp_save_image( $post_id ) {
 		if ( $tag )
 			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
-		$success = update_attached_file( $post_id, $new_path );
+		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
 		$meta['file'] = _wp_relative_upload_path( $new_path );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4863f38b50..6e4a5758e7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31042';
+$wp_version = '4.2-alpha-31043';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.