diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index 8f9b43cb89..34dd539375 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -549,6 +549,9 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		try {
 			$this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
 
+			// Normalise Exif orientation data so that display is consistent across devices.
+			$this->image->setImageOrientation( Imagick::ORIENTATION_TOPLEFT );
+
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
 			if ( is_wp_error( $result ) )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6c0a7e9471..fa63549437 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-40122';
+$wp_version = '4.8-alpha-40123';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.