Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -244,7 +244,19 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
                     true);
             }
         }
-        
+
+        [ConfigurationProperty("EnableInheritedMediaTypes")]
+        internal InnerTextConfigurationElement<bool> EnableInheritedMediaTypes
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["EnableInheritedMediaTypes"],
+                    //set the default
+                    true);
+            }
+        }
+
         string IContentSection.NotificationEmailAddress
         {
             get { return Notifications.NotificationEmailAddress; }
@@ -369,5 +381,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get { return EnableInheritedDocumentTypes; }
         }
+
+        bool IContentSection.EnableInheritedMediaTypes
+        {
+            get { return EnableInheritedMediaTypes; }
+        }
     }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -56,5 +56,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         string DefaultDocumentTypeProperty { get; }
 
         bool EnableInheritedDocumentTypes { get; }
+
+        bool EnableInheritedMediaTypes { get; }
     }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs

@@ -9,6 +9,8 @@
         bool DisableAlternativeTemplates { get; }
 
         bool DisableFindContentByIdPath { get; }
+		
+        bool DisableRedirectUrlTracking { get; }
 
         string UrlProviderMode { get; }
 

src/Umbraco.Core/Configuration/UmbracoSettings/WebRoutingElement.cs

@@ -27,6 +27,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return (bool) base["disableFindContentByIdPath"]; }
         }
 
+        [ConfigurationProperty("disableRedirectUrlTracking", DefaultValue = "false")]
+        public bool DisableRedirectUrlTracking
+        {
+            get { return (bool) base["disableRedirectUrlTracking"]; }
+        }
+
         [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
         public string UrlProviderMode
         {

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -21,7 +21,7 @@ namespace Umbraco.Core.Configuration
         /// <summary>
         /// Gets the version comment of the executing code (eg "beta").
         /// </summary>
-        public static string CurrentComment => "alpha0020";
+        public static string CurrentComment => "alpha0021";
 
         /// <summary>
         /// Gets the assembly version of Umbraco.Code.dll.