Merge branch 'dev' into reformat

MediaBrowser.Controller/Entities/Photo.cs

@@ -61,8 +61,7 @@ namespace MediaBrowser.Controller.Entities
                     }
                 }
 
-                width /= Height.Value;
-                return width;
+                return width / height;
             }
 
             return base.GetDefaultPrimaryImageAspectRatio();