Merge branch 'dev-v7.6' into master-v76

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.6.10")]
-[assembly: AssemblyInformationalVersion("7.6.10")]
+[assembly: AssemblyFileVersion("7.6.11")]
+[assembly: AssemblyInformationalVersion("7.6.11")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.6.10");
+        private static readonly Version Version = new Version("7.6.11");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js

@@ -43,7 +43,10 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                         function(id) {
                             var found = _.find(medias,
                                 function(m) {
-                                    return m.udi === id || m.id === id;
+                                    // We could use coercion (two ='s) here .. but not sure if this works equally well in all browsers and
+                                    // it's prone to someone "fixing" it at some point without knowing the effects. Rather use toString()
+                                    // compares and be completely sure it works.
+                                    return m.udi.toString() === id.toString() || m.id.toString() === id.toString();
                                 });
                             if (found) {
                                 return found;

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -2379,9 +2379,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7610</DevelopmentServerPort>
+          <DevelopmentServerPort>7611</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7610</IISUrl>
+          <IISUrl>http://localhost:7611</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>