Merge branch '7.3.7' of https://github.com/umbraco/Umbraco-CMS into 7.3.7

adds null check to session id - might not exist in old cookies
Merge pull request #1078 from dawoe/U4-7872
2016-02-02 18:01:56 +01:00 · 2016-02-02 18:01:36 +01:00 · 2016-02-02 17:06:56 +01:00 · 2016-02-02 17:05:21 +01:00 · 2016-02-02 16:52:08 +01:00 · 2016-02-02 16:51:57 +01:00
1389 changed files with 33111 additions and 48509 deletions
@@ -76,6 +76,7 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js

@@ -129,3 +130,5 @@ src/*.boltdata/
 /src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
 src/umbraco.sln.ide/*
 build/UmbracoCms.*/
+src/.vs/
+src/Umbraco.Web.UI/umbraco/js/install.loader.js
@@ -7,9 +7,9 @@ The easiest way to get started is to run `build/build.bat` which will build both
 
 If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.

-## Watch a five minute introduction video ##
+## Watch a introduction video ##

-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)

 ## Umbraco - the simple, flexible and friendly ASP.NET CMS ##

@@ -25,9 +25,9 @@ ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise
 SET nuGetFolder=%CD%\..\src\packages\
 ..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore >NUL
 ..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet

 ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
 RD ..\src\Umbraco.Web.UI.Client\build /Q /S
@@ -43,7 +43,7 @@ DEL /F /Q webpihash.txt
 ECHO Making sure Git is in the path so that the build can succeed
 CALL InstallGit.cmd
 ECHO Performing MSBuild and producing Umbraco binaries zip files
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment% /verbosity:minimal

 ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
 attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
@@ -53,11 +53,13 @@ REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform

 ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version% -Symbols -Verbosity quiet
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version% -Verbosity quiet
                        
 IF ERRORLEVEL 1 GOTO :showerror

+ECHO No errors were detected but you still may see some in the output, then it's time to investigate.
+ECHO You might see some warnings but that is completely normal.
 GOTO :EOF

 :showerror
@@ -68,6 +68,12 @@
  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!=''">
    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)</DECIMAL_BUILD_NUMBER>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_NIGHTLY)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_NIGHTLY)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>

  <PropertyGroup>
    <BuildConfiguration>Release</BuildConfiguration>
@@ -91,15 +97,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <SystemFolders Include="$(WebAppFolder)App_Plugins" />
-    <SystemFolders Include="$(WebAppFolder)App_Code" />
    <SystemFolders Include="$(WebAppFolder)App_Data" />
    <SystemFolders Include="$(WebAppFolder)Media" />
-    <SystemFolders Include="$(WebAppFolder)Masterpages" />
-    <SystemFolders Include="$(WebAppFolder)Scripts" />
-    <SystemFolders Include="$(WebAppFolder)Css" />
-    <SystemFolders Include="$(WebAppFolder)Xslt" />
-    <SystemFolders Include="$(WebAppFolder)UserControls" />
    <SystemFolders Include="$(WebAppFolder)Views" />
  </ItemGroup>

@@ -145,14 +144,14 @@
        DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />

    <!-- Zip the files -->
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22 -x!dotLess.Core.dll -x![Content_Types].xml >NUL" />
  </Target>

  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
    <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />

-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22 -x!dotLess.Core.dll >NUL" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll -x![Content_Types].xml >NUL" />

    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
  </Target>
@@ -219,6 +218,7 @@
  <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
    <ItemGroup>
      <ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
+      <CustomLanguageFiles Include="$(WebAppFolder)config\lang\*.xml" />
      <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
    </ItemGroup>

@@ -227,6 +227,11 @@
        OverwriteReadOnlyFiles="true"
        SkipUnchangedFiles="false" />

+    <Copy SourceFiles="@(CustomLanguageFiles)"
+      DestinationFiles="@(CustomLanguageFiles->'$(ConfigsFolder)Lang\%(RecursiveDir)%(Filename)%(Extension)')"
+      OverwriteReadOnlyFiles="true"
+      SkipUnchangedFiles="false" />
+	  
    <Copy SourceFiles="@(WebConfigTransformFile)"
      DestinationFiles="$(ConfigsFolder)Web.config.transform"
      OverwriteReadOnlyFiles="true"
@@ -259,7 +264,7 @@
    <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
    <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
    <!-- Build the Umbraco.Web.UI project -->
-    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
    </MSBuild>

    <!-- DONE -->
@@ -271,9 +276,11 @@
    <PropertyGroup>
      <NewVersion>$(BUILD_RELEASE)</NewVersion>
      <NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
+      <NewVersion Condition="'$(BUILD_NIGHTLY)'!=''">$(BUILD_RELEASE)-$(BUILD_NIGHTLY)</NewVersion>
+      <NewVersion Condition="'$(BUILD_COMMENT)'!='' And '$(BUILD_NIGHTLY)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)</NewVersion>
    </PropertyGroup>

-    <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
+    <!-- Match & replace 3 and 4 digit version numbers and -beta and +nightly (if they're there) -->
    <FileUpdate
      Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
      Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
@@ -283,6 +290,16 @@
      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>

+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+	  Condition="'$(BUILD_NIGHTLY)'!=''"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
+      ReplacementText="CurrentComment { get { return &quot;$(BUILD_NIGHTLY)&quot;"/>
+	  
+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+	  Condition="'$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
+      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)-$(BUILD_NIGHTLY)&quot;"/>
+
    <!--This updates the AssemblyFileVersion for the solution to the umbraco version-->
    <FileUpdate
      Files="..\src\SolutionInfo.cs"
@@ -300,10 +317,24 @@
      Files="..\src\SolutionInfo.cs"
      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
+    <FileUpdate 
+      Condition="'$(BUILD_NIGHTLY)'!=''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_NIGHTLY)&quot;)"/>
+	<FileUpdate 
+      Condition="'$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)&quot;)"/>
+    <FileUpdate 
+      Condition="'$(BUILD_COMMENT)'=='' AND '$(BUILD_NIGHTLY)'==''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
    
    <!--This updates the copyright year-->
    <FileUpdate 
-      Condition="'$(BUILD_COMMENT)'==''"
      Files="..\src\SolutionInfo.cs"
      Regex="AssemblyCopyright\(&quot;Copyright © Umbraco (\d{4})&quot;\)"
      ReplacementText="AssemblyCopyright(&quot;Copyright © Umbraco $([System.DateTime]::Now.ToString(`yyyy`))&quot;)"/>
@@ -1,4 +1,6 @@
@ECHO OFF
+SETLOCAL
+
 SET release=%1
 ECHO Installing Npm NuGet Package

@@ -6,17 +8,14 @@ SET nuGetFolder=%CD%\..\src\packages\
 ECHO Configured packages folder: %nuGetFolder%
 ECHO Current folder: %CD%

-%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%
+%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet

 for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
 for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"

-ECHO Temporarily adding Npm and Node to path
-SET oldPath=%PATH%
-
-path=%npmPath%;%nodePath%;%PATH%
-
-ECHO %path%
+ECHO Adding Npm and Node to path 
+REM SETLOCAL is on, so changes to the path not persist to the actual user's path
+PATH=%npmPath%;%nodePath%;%PATH%

 SET buildFolder=%CD%

@@ -24,13 +23,10 @@ ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
 CD %CD%\..\src\Umbraco.Web.UI.Client\

 ECHO Do npm install and the grunt build of Belle
-call npm install
-call npm install -g grunt-cli
-call npm install -g bower
+call npm install --quiet
+call npm install -g grunt-cli --quiet
+call npm install -g bower --quiet
 call grunt build --buildversion=%release%

-ECHO Reset path to what it was before
-path=%oldPath%
-
 ECHO Move back to the build folder
 CD %buildFolder% 
@@ -1,19 +1,19 @@
@ECHO OFF
-SET oldPath=%PATH%
+SETLOCAL
+REM SETLOCAL is on, so changes to the path not persist to the actual user's path

 git.exe 2> NUL
 if %ERRORLEVEL%==9009 GOTO :trydefaultpath
 GOTO :EOF

 :trydefaultpath
-path=C:\Program Files (x86)\Git\cmd;%PATH%
+path=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
 git.exe 2> NUL
 if %ERRORLEVEL%==9009 GOTO :showerror
 GOTO :EOF

 :showerror
-path=%oldPath%
-ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\bin 
+ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
 set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
 if %install%==y (
 	GOTO :installgit
@@ -29,5 +29,4 @@ GOTO :EOF
 ECHO Installing Chocolatey first
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
 ECHO Installing Git through Chocolatey
-choco install git
-path=C:\Program Files (x86)\Git\cmd;%path%
+choco install git
@@ -15,27 +15,30 @@
    <language>en-US</language>
    <tags>umbraco</tags>
    <dependencies>
-      <dependency id="Microsoft.AspNet.Mvc" version="[4.0.40804.0,6.0.0)" />
+      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" />
-      <dependency id="Microsoft.Net.Http" version="[2.0.20710.0, 3.0.0)" />
-      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.0, 3.0.0)" />
+      <dependency id="Microsoft.Net.Http" version="[2.2.29, 3.0.0)" />
+      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />      
      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
+      <dependency id="HtmlAgilityPack" version="[1.4.9, 2.0.0)" />
      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
-      <dependency id="MySql.Data" version="[6.9.6, 7.0.0)" />
+      <dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.8.3.1, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
-      <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
-      <dependency id="Examine" version="[0.1.63, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.0)" />
+      <dependency id="ClientDependency" version="[1.8.4, 2.0.0)" />
+      <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
+      <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 7.0.0)" />
+      <dependency id="Examine" version="[0.1.68, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.3.2, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.5.1, 5.0.0)" />
+      <dependency id="semver" version="[1.1.2, 2.0.0)" />
+      <dependency id="Microsoft.AspNet.WebHelpers" version="[3.2.3, 4.0.0)" />
+      <dependency id="Microsoft.AspNet.WebPages.Data" version="[3.2.3, 4.0.0)" />
+      <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -70,7 +73,6 @@
    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\UmbracoExamine.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
    <file src="tools\install.core.ps1" target="tools\install.ps1" />

 	<!-- Added to be able to produce a symbols package -->
@@ -26,7 +26,6 @@
    <file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
    <file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
    <file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-    <file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
    <file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
    <file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
    <file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
@@ -41,6 +40,7 @@
    <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
    <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
    <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
+    <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
    <file src="build\**" target="build" />
  </files>
 </package>
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyUmbracoFilesToWebRootForDeploy" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
+    <PropertyGroup>
+      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="$(_PackageTempDir)\%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>  
  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+	<!-- This copies the files listed in `AddUmbracoFilesToOutput` to the webroot during NuGet install and should -->
+	<!-- not be altered to support automated builds, use `CopyUmbracoFilesToWebRootForDeploy` for that instead -->
    <PropertyGroup>
      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
    </PropertyGroup>
@@ -47,4 +58,4 @@
      </FilesForPackagingFromProject>
    </ItemGroup>
  </Target>
-</Project>
+</Project>
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
      <control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
@@ -20,7 +20,7 @@
    </tab>
  </section>

-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
      <control showOnce="true" addPanel="true" panelCaption="">
        views/dashboard/developer/developerdashboardvideos.html
@@ -29,15 +29,20 @@
    <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
  </section>
  
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
      <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
      <control>
        views/dashboard/developer/examinemanagement.html
      </control>
    </tab>    
+    <tab caption="Xml Data Integrity Report" xdt:Transform="InsertIfMissing">
+      <control>
+        views/dashboard/developer/xmldataintegrityreport.html
+      </control>
+    </tab>  
  </section>
  
-  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
@@ -47,7 +52,7 @@
    </tab>
  </section>
  
-  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Get Started" xdt:Transform="Insert">
      <access>
@@ -57,17 +62,10 @@
        views/dashboard/default/startupdashboardintro.html
      </control>
    </tab>
-    <tab caption="Change password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Transform="Insert">
-      <control showOnce="false" addPanel="false" panelCaption="">
-        views/dashboard/ChangePassword.html
-      </control>
-    </tab>
    <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
  </section>
  
-  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Get Started" xdt:Transform="Insert">
      <control showOnce="true" addPanel="true" panelCaption="">
@@ -10,9 +10,6 @@

 Don't forget to build!

-When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
-file (and config files in the config folder). 
-
 We've done our best to transform your configuration files but in case something is not quite right: remember we
 backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.

@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)" />
+    </sectionGroup>
+  </configSections>
+  
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(factoryType)" 
+		xdt:Transform="SetAttributes(factoryType)" />
+  </system.web.webPages.razor>
+  
+  <system.web>
+      <pages
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+			xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)" 
+			xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" 
+			xdt:Locator="Match(namespace)" 
+			xdt:Transform="SetAttributes(assembly)" />
+      </controls>
+    </pages>
+  </system.web>
+  
+</configuration>
@@ -20,10 +20,9 @@

  <appSettings xdt:Transform="InsertIfMissing" />
  <appSettings>
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
  </appSettings>
-
+  
  <umbracoConfiguration xdt:Transform="InsertIfMissing">
    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
    <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
@@ -49,6 +48,13 @@
  <system.web xdt:Transform="InsertIfMissing" />
  <system.web>
    <siteMap xdt:Transform="Remove" />
+	<siteMap xdt:Transform="InsertIfMissing">
+      <providers xdt:Transform="InsertIfMissing">
+        <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
+      </providers>
+      </siteMap>	
+    <httpRuntime xdt:Transform="InsertIfMissing" />
+    <httpRuntime targetFramework="4.5" maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(targetFramework,fcnMode,maxRequestLength)" />
    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
@@ -75,6 +81,10 @@
    </compilation>

    <compilation>
+      <assemblies>
+        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+      </assemblies>
      <assemblies>
        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
@@ -130,6 +140,13 @@
      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
    </handlers>
+
+    <security xdt:Transform="InsertIfMissing">
+      <requestFiltering xdt:Transform="InsertIfMissing">
+        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
+      </requestFiltering>
+    </security>
+    
  </system.webServer>

  <system.codedom xdt:Transform="Remove" />
@@ -141,15 +158,26 @@
  
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Htttp')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
+	  <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
    </assemblyBinding>
  </runtime>

  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
+      </dependentAssembly>	
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
@@ -160,12 +188,36 @@
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>		  
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>	  
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>	  
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>	  	 
+	  <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>

@@ -57,12 +57,25 @@ if ($project) {
 		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }	
+		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<log4net xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <appender name="AsynchronousLog4NetAppender" xdt:Transform="Remove" xdt:Locator="Match(name)" /> 
+  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core" xdt:Transform="Insert" >
+    <appender-ref ref="rollingFile" />
+  </appender>
+  
+  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender" xdt:Transform="InsertIfMissing">
+    <file value="App_Data\Logs\UmbracoTraceLog.txt" />
+    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    <appendToFile value="true" />
+    <rollingStyle value="Date" />
+    <maximumFileSize value="5MB" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    </layout>
+    <encoding value="utf-8" />
+  </appender>
+</log4net>
+
@@ -7,12 +7,12 @@
  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="templates" title="Templates" type="umbraco.loadTemplates, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add alias="dictionary" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
-  <add application="settings" alias="languages" title="Languages" type="umbraco.loadLanguages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add initialize="true" sortOrder="0" alias="datatype" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
@@ -45,9 +45,6 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
 echo Removing masterpage files
 del ..\src\Umbraco.Web.UI\masterpages\*.*

-echo Removing view files
-del ..\src\Umbraco.Web.UI\Views\*.*
-
 echo Removing razor files
 del ..\src\Umbraco.Web.UI\macroScripts\*.*

@@ -104,7 +101,9 @@ echo Removing user control files
 FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A

 echo Removing view files
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S

 echo Removing razor files
 FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -54,9 +54,6 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
 echo Removing masterpage files
 del ..\src\Umbraco.Web.UI\masterpages\*.*

-echo Removing view files
-del ..\src\Umbraco.Web.UI\Views\*.*
-
 echo Removing razor files
 del ..\src\Umbraco.Web.UI\macroScripts\*.*

@@ -122,7 +119,9 @@ echo Removing user control files
 FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A

 echo Removing view files
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S

 echo Removing razor files
 FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -151,6 +150,9 @@ rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
 echo Start with a clean web.config
 copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y

+echo Start with a clean web.config
+copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+
 echo "Umbraco install reverted to clean install"
 pause 
 exit
@@ -1,3 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.3.0
-beta
+7.3.7
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="umbracocore" value="http://www.myget.org/f/umbracocore/" />
+  </packageSources>
+</configuration>
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String></wpf:ResourceDictionary>
@@ -2,7 +2,7 @@
 using System.Resources;

 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2015")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -11,5 +11,5 @@ using System.Resources;

 [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyFileVersion("7.3.0")]
-[assembly: AssemblyInformationalVersion("7.3.0-beta")]
+[assembly: AssemblyFileVersion("7.3.7")]
+[assembly: AssemblyInformationalVersion("7.3.7")]
@@ -11,7 +11,7 @@ namespace Umbraco.Core
 	/// <summary>
 	/// A resolver to return all IAction objects
 	/// </summary>
-	internal sealed class ActionsResolver : LazyManyObjectsResolverBase<ActionsResolver, IAction>
+	public sealed class ActionsResolver : LazyManyObjectsResolverBase<ActionsResolver, IAction>
 	{
 	    /// <summary>
 	    /// Constructor
@@ -1,16 +1,14 @@
 using System;
 using System.Configuration;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Web;
-using System.Web.Caching;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
-
+using Umbraco.Core.Sync;

 namespace Umbraco.Core
 {
@@ -34,10 +32,13 @@ namespace Umbraco.Core
            if (dbContext == null) throw new ArgumentNullException("dbContext");
            if (serviceContext == null) throw new ArgumentNullException("serviceContext");
            if (cache == null) throw new ArgumentNullException("cache");
+            if (logger == null) throw new ArgumentNullException("logger");
            _databaseContext = dbContext;
            _services = serviceContext;
            ApplicationCache = cache;
            ProfilingLogger = logger;
+
+            Init();
 	    }

 	    /// <summary>
@@ -46,7 +47,7 @@ namespace Umbraco.Core
        /// <param name="dbContext"></param>
        /// <param name="serviceContext"></param>
        /// <param name="cache"></param>
-        [Obsolete("Use the other constructor specifying an ILogger instead")]
+        [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
            : this(dbContext, serviceContext, cache, 
                new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler))
@@ -57,9 +58,27 @@ namespace Umbraco.Core
        /// Creates a basic app context
        /// </summary>
        /// <param name="cache"></param>
+        [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
        public ApplicationContext(CacheHelper cache)
        {
+            if (cache == null) throw new ArgumentNullException("cache");
            ApplicationCache = cache;
+            ProfilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
+            Init();
+        }
+
+	    /// <summary>
+	    /// Creates a basic app context
+	    /// </summary>
+	    /// <param name="cache"></param>
+	    /// <param name="logger"></param>
+	    public ApplicationContext(CacheHelper cache, ProfilingLogger logger)
+        {
+	        if (cache == null) throw new ArgumentNullException("cache");
+	        if (logger == null) throw new ArgumentNullException("logger");
+	        ApplicationCache = cache;
+	        ProfilingLogger = logger;
+            Init();
        }

 	    /// <summary>
@@ -75,13 +94,13 @@ namespace Umbraco.Core
 	    /// </remarks>
 	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
 	    {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
-            ApplicationContext.Current = appContext;
-            return ApplicationContext.Current;
+            Current = appContext;
+            return Current;
 	    }

 	    /// <summary>
@@ -101,14 +120,14 @@ namespace Umbraco.Core
        [Obsolete("Use the other method specifying an ProfilingLogger instead")]
 	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
        {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
-            ApplicationContext.Current = ctx;
-            return ApplicationContext.Current;
+            Current = ctx;
+            return Current;
        }

 	    /// <summary>
@@ -128,14 +147,14 @@ namespace Umbraco.Core
 	    /// </remarks>
        public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, ProfilingLogger logger, bool replaceContext)
        {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
            var ctx = new ApplicationContext(dbContext, serviceContext, cache, logger);
-            ApplicationContext.Current = ctx;
-            return ApplicationContext.Current;
+            Current = ctx;
+            return Current;
        }

 	    /// <summary>
@@ -190,16 +209,10 @@ namespace Umbraco.Core
        //   GlobalSettings.CurrentVersion returns the hard-coded "current version"
        //   the system is configured if they match
        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
-        //
-        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
-        //
+        
        public bool IsConfigured
        {
-            // todo - we should not do this - ok for now
-            get
-            {
-            	return Configured;
-            }
+            get { return _configured.Value; }
        }

        /// <summary>
@@ -222,47 +235,91 @@ namespace Umbraco.Core
 	    }

 	    /// <summary>
-        /// The original/first url that the web application executes
+        /// The application url.
        /// </summary>
        /// <remarks>
-        /// we need to set the initial url in our ApplicationContext, this is so our keep alive service works and this must
-        /// exist on a global context because the keep alive service doesn't run in a web context.
-        /// we are NOT going to put a lock on this because locking will slow down the application and we don't really care
-        /// if two threads write to this at the exact same time during first page hit.
-        /// see: http://issues.umbraco.org/issue/U4-2059
+        /// The application url is the url that should be used by services to talk to the application,
+        /// eg keep alive or scheduled publishing services. It must exist on a global context because
+        /// some of these services may not run within a web context.
+        /// The format of the application url is:
+        /// - has a scheme (http or https)
+        /// - has the SystemDirectories.Umbraco path
+        /// - does not end with a slash
+        /// It is initialized on the first request made to the server, by UmbracoModule.EnsureApplicationUrl:
+        /// - if umbracoSettings:settings/web.routing/@umbracoApplicationUrl is set, use the value (new setting)
+        /// - if umbracoSettings:settings/scheduledTasks/@baseUrl is set, use the value (backward compatibility)
+        /// - otherwise, use the url of the (first) request.
+        /// Not locking, does not matter if several threads write to this.
+        /// See also issues:
+        /// - http://issues.umbraco.org/issue/U4-2059
+        /// - http://issues.umbraco.org/issue/U4-6788
+        /// - http://issues.umbraco.org/issue/U4-5728
+        /// - http://issues.umbraco.org/issue/U4-5391
        /// </remarks>
-        internal string OriginalRequestUrl { get; set; }
+        internal string UmbracoApplicationUrl
+        {
+            get
+            {
+                ApplicationUrlHelper.EnsureApplicationUrl(this);
+                return _umbracoApplicationUrl;
+            }
+        }

-	    private bool _versionsDifferenceReported;
+	    // ReSharper disable once InconsistentNaming
+	    internal string _umbracoApplicationUrl;

-        /// <summary>
-        /// Checks if the version configured matches the assembly version
-        /// </summary>
-		private bool Configured
+        private Lazy<bool> _configured;
+        internal MainDom MainDom { get; private set; }
+       
+	    private void Init()
 		{
-			get
-			{
-				try
-				{
-					var configStatus = ConfigurationStatus;
-					var currentVersion = UmbracoVersion.Current.ToString(3);
-				    var ok = configStatus == currentVersion;
+            MainDom = new MainDom(ProfilingLogger.Logger);
+            MainDom.Acquire();
+            
+            //Create the lazy value to resolve whether or not the application is 'configured'
+            _configured = new Lazy<bool>(() =>
+            {
+                try
+                {
+                    var configStatus = ConfigurationStatus;
+                    var currentVersion = UmbracoVersion.GetSemanticVersion();

-					if (ok == false && _versionsDifferenceReported == false)
-					{
-                        // remember it's been reported so we don't flood the log
-                        // no thread-safety so there may be a few log entries, doesn't matter
-                        _versionsDifferenceReported = true;
-                        ProfilingLogger.Logger.Debug<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
-					}
-						
-					return ok;
-				}
-				catch
-				{
-					return false;
-				}
-			}
+                    var ok =
+                        //we are not configured if this is null    
+                        string.IsNullOrWhiteSpace(configStatus) == false
+                        //they must match
+                        && configStatus == currentVersion;
+
+                    if (ok)
+                    {
+                        //The versions are the same in config, but are they the same in the database. We can only check this
+                        // if we have a db context available, if we don't then we are not installed anyways
+                        if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
+                        {
+                            var found = Services.MigrationEntryService.FindEntry(GlobalSettings.UmbracoMigrationName, UmbracoVersion.GetSemanticVersion());
+                            if (found == null)
+                            {
+                                //we haven't executed this migration in this environment, so even though the config versions match, 
+                                // this db has not been updated.
+                                ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("The migration for version: '{0} has not been executed, there is no record in the database", currentVersion.ToSemanticString()));
+                                ok = false;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("CurrentVersion different from configStatus: '{0}','{1}'", currentVersion.ToSemanticString(), configStatus));
+                    }
+
+                    return ok;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<ApplicationContext>("Error determining if application is configured, returning false", ex);
+                    return false;
+                }
+
+            }); 
 		}

 		private string ConfigurationStatus
@@ -280,12 +337,6 @@ namespace Umbraco.Core
 			}			
 		}

-        private void AssertIsReady()
-        {
-            if (!this.IsReady)
-                throw new Exception("ApplicationContext is not ready yet.");
-        }
-
        private void AssertIsNotReady()
        {
            if (this.IsReady)
@@ -326,6 +377,11 @@ namespace Umbraco.Core
 			internal set { _services = value; }
 		}

+	    internal ServerRole GetCurrentServerRole()
+	    {
+	        var registrar = ServerRegistrarResolver.Current.Registrar as IServerRegistrar2;
+            return registrar == null ? ServerRole.Unknown : registrar.GetCurrentServerRole();
+	    }

        private volatile bool _disposed;
        private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
@@ -350,7 +406,8 @@ namespace Umbraco.Core
                //clear the cache
                if (ApplicationCache != null)
                {
-                    ApplicationCache.ClearAllCache();    
+                    ApplicationCache.RuntimeCache.ClearAllCache();
+                    ApplicationCache.IsolatedRuntimeCache.ClearAllCaches();
                }
                //reset all resolvers
                ResolverCollection.ResetAll();
@@ -74,7 +74,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        private bool ShouldExecute(ApplicationContext applicationContext)
        {
-            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.CanConnect)
+            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
            {
                return true;
            }
@@ -84,7 +84,7 @@ namespace Umbraco.Core
                return true;
            }

-            if (!applicationContext.DatabaseContext.CanConnect && ExecuteWhenDatabaseNotConfigured)
+            if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
            {
                return true;
            }
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.ConstrainedExecution;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;

@@ -63,14 +64,14 @@ namespace Umbraco.Core
            // for anonymous semaphore, use the unique releaser, else create a new one
            return _semaphore != null
                ? _releaser // (IDisposable)new SemaphoreSlimReleaser(_semaphore)
-                : (IDisposable)new NamedSemaphoreReleaser(_semaphore2);
+                : new NamedSemaphoreReleaser(_semaphore2);
        }

        public Task<IDisposable> LockAsync()
        {
            var wait = _semaphore != null 
-                ? _semaphore.WaitAsync() 
-                : WaitOneAsync(_semaphore2);
+                ? _semaphore.WaitAsync()
+                : _semaphore2.WaitOneAsync();

            return wait.IsCompleted 
                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
@@ -79,6 +80,19 @@ namespace Umbraco.Core
                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
        }

+        public Task<IDisposable> LockAsync(int millisecondsTimeout)
+        {
+            var wait = _semaphore != null
+                ? _semaphore.WaitAsync(millisecondsTimeout)
+                : _semaphore2.WaitOneAsync(millisecondsTimeout);
+
+            return wait.IsCompleted
+                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+                : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
+                    this, CancellationToken.None,
+                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        }
+
        public IDisposable Lock()
        {
            if (_semaphore != null)
@@ -104,38 +118,55 @@ namespace Umbraco.Core
        private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
        {
            private readonly Semaphore _semaphore;
+            private GCHandle _handle;

            internal NamedSemaphoreReleaser(Semaphore semaphore)
            {
                _semaphore = semaphore;
+                _handle = GCHandle.Alloc(_semaphore);
            }

            public void Dispose()
            {
                Dispose(true);
-                GC.SuppressFinalize(this);
+                GC.SuppressFinalize(this); // finalize will not run
            }

            private void Dispose(bool disposing)
            {
                // critical
+                _handle.Free();
                _semaphore.Release();
+                _semaphore.Dispose();
            }

-            // we WANT to release the semaphore because it's a system object
-            // ie a critical non-managed resource - so we inherit from CriticalFinalizerObject
-            // which means that the finalizer "should" run in all situations
+            // we WANT to release the semaphore because it's a system object, ie a critical 
+            // non-managed resource - and if it is not released then noone else can acquire
+            // the lock - so we inherit from CriticalFinalizerObject which means that the 
+            // finalizer "should" run in all situations - there is always a chance that it
+            // does not run and the semaphore remains "acquired" but then chances are the
+            // whole process (w3wp.exe...) is going down, at which point the semaphore will
+            // be destroyed by Windows.

-            // however... that can fail with System.ObjectDisposedException because the
-            // underlying handle was closed... because we cannot guarantee that the semaphore
-            // is not gone already... unless we get a GCHandle = GCHandle.Alloc(_semaphore);
-            // which should keep it around and then we free the handle?
+            // however, the semaphore is a managed object, and so when the finalizer runs it
+            // might have been finalized already, and then we get a, ObjectDisposedException
+            // in the finalizer - which is bad.

-            // so... I'm not sure this is safe really...
+            // in order to prevent this we do two things
+            // - use a GCHandler to ensure the semaphore is still there when the finalizer
+            //   runs, so we can actually release it
+            // - wrap the finalizer code in a try...catch to make sure it never throws

            ~NamedSemaphoreReleaser()
            {
-                Dispose(false);
+                try
+                {
+                    Dispose(false);
+                }
+                catch
+                {
+                    // we do NOT want the finalizer to throw - never ever
+                }
            }
        }

@@ -168,40 +199,5 @@ namespace Umbraco.Core
                Dispose(false);
            }
        }
-
-        // http://stackoverflow.com/questions/25382583/waiting-on-a-named-semaphore-with-waitone100-vs-waitone0-task-delay100
-        // http://blog.nerdbank.net/2011/07/c-await-for-waithandle.html
-        // F# has a AwaitWaitHandle method that accepts a time out... and seems pretty complex...
-        // version below should be OK
-
-        private static Task WaitOneAsync(WaitHandle handle)
-        {
-            var tcs = new TaskCompletionSource<object>();
-            var callbackHandleInitLock = new object();
-            lock (callbackHandleInitLock)
-            {
-                RegisteredWaitHandle callbackHandle = null;
-                // ReSharper disable once RedundantAssignment
-                callbackHandle = ThreadPool.RegisterWaitForSingleObject(
-                    handle,
-                    (state, timedOut) =>
-                    {
-                        tcs.SetResult(null);
-
-                        // we take a lock here to make sure the outer method has completed setting the local variable callbackHandle.
-                        lock (callbackHandleInitLock)
-                        {
-                            // ReSharper disable once PossibleNullReferenceException
-                            // ReSharper disable once AccessToModifiedClosure
-                            callbackHandle.Unregister(null);
-                        }
-                    },
-                    /*state:*/ null,
-                    /*millisecondsTimeOutInterval:*/ Timeout.Infinite,
-                    /*executeOnlyOnce:*/ true);
-            }
-
-            return tcs.Task;
-        }
    }
 }
@@ -1,8 +1,9 @@
 using System;
+using System.ComponentModel;
+using Umbraco.Core.CodeAnnotations;

 namespace Umbraco.Core.Cache
 {
-
    /// <summary>
    /// Constants storing cache keys used in caching
    /// </summary>
@@ -12,52 +13,78 @@ namespace Umbraco.Core.Cache
        public const string ApplicationsCacheKey = "ApplicationCache";

        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string UserTypeCacheKey = "UserTypeCache";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future - it is referenced but no cache is stored against this key")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string ContentItemCacheKey = "contentItem";

+        [UmbracoWillObsolete("This cache key is only used for the legacy 'library' caching, remove in v8")]
        public const string MediaCacheKey = "UL_GetMedia";

        public const string MacroXsltCacheKey = "macroXslt_";
+
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
        public const string MacroCacheKey = "UmbracoMacroCache";
+
        public const string MacroHtmlCacheKey = "macroHtml_";
        public const string MacroControlCacheKey = "macroControl_";
        public const string MacroHtmlDateAddedCacheKey = "macroHtml_DateAdded_";
        public const string MacroControlDateAddedCacheKey = "macroControl_DateAdded_";

+        [UmbracoWillObsolete("This cache key is only used for legacy 'library' member caching, remove in v8")]
        public const string MemberLibraryCacheKey = "UL_GetMember";
+
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
        public const string MemberBusinessLogicCacheKey = "MemberCacheItem_";
-        
+
+        [UmbracoWillObsolete("This cache key is only used for legacy template business logic caching, remove in v8")]
        public const string TemplateFrontEndCacheKey = "template";

        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string TemplateBusinessLogicCacheKey = "UmbracoTemplateCache";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string UserContextCacheKey = "UmbracoUserContext";
+
        public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout";

        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string UserCacheKey = "UmbracoUser";
        
        public const string UserPermissionsCacheKey = "UmbracoUserPermissions";

+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
        public const string ContentTypeCacheKey = "UmbracoContentType";

+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
        public const string ContentTypePropertiesCacheKey = "ContentType_PropertyTypes_Content:";
        
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
        public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache";

        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string LanguageCacheKey = "UmbracoLanguageCache";

        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string DomainCacheKey = "UmbracoDomainList";

        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string StylesheetCacheKey = "UmbracoStylesheet";
+
        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
        public const string DataTypePreValuesCacheKey = "UmbracoPreVal";

@@ -2,6 +2,7 @@
 using Umbraco.Core.Events;
 using Umbraco.Core.Sync;
 using umbraco.interfaces;
+using Umbraco.Core.Models.EntityBase;

 namespace Umbraco.Core.Cache
 {
@@ -63,5 +64,15 @@ namespace Umbraco.Core.Cache
        {
            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RefreshById));
        }
+
+        /// <summary>
+        /// Clears the cache for all repository entities of this type
+        /// </summary>
+        /// <typeparam name="TEntity"></typeparam>
+        internal void ClearAllIsolatedCacheByEntityType<TEntity>()
+            where TEntity : class, IAggregateRoot
+        {
+            ApplicationContext.Current.ApplicationCache.IsolatedRuntimeCache.ClearCache<TEntity>();
+        }
    }
 }
@@ -2,11 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Caching;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;

-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Cache
 {
    /// <summary>
    /// A wrapper for any IRuntimeCacheProvider that ensures that all inserts and returns 
@@ -79,7 +78,7 @@ namespace Umbraco.Core.Persistence.Repositories

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
        {
-            return  InnerProvider.GetCacheItem(cacheKey, () =>
+            var cached = InnerProvider.GetCacheItem(cacheKey, () =>
            {
                var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
@@ -87,18 +86,21 @@ namespace Umbraco.Core.Persistence.Repositories

                return CheckCloneableAndTracksChanges(value);
            });
+            return CheckCloneableAndTracksChanges(cached);
        }

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
-            return InnerProvider.GetCacheItem(cacheKey, () =>
+            var cached = InnerProvider.GetCacheItem(cacheKey, () =>
            {
                var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                if (value == null) return null; // do not store null values (backward compat)

                return CheckCloneableAndTracksChanges(value);
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);         
+            }, timeout, isSliding, priority, removedCallback, dependentFiles);
+
+            return CheckCloneableAndTracksChanges(cached);
        }

        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
@@ -0,0 +1,268 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// The default cache policy for retrieving a single entity
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TId"></typeparam>
+    /// <remarks>
+    /// This cache policy uses sliding expiration and caches instances for 5 minutes. However if allow zero count is true, then we use the
+    /// default policy with no expiry.
+    /// </remarks>
+    internal class DefaultRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private readonly RepositoryCachePolicyOptions _options;
+       
+        public DefaultRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options)
+            : base(cache)
+        {            
+            if (options == null) throw new ArgumentNullException("options");
+            _options = options;         
+        }
+
+        protected string GetCacheIdKey(object id)
+        {
+            if (id == null) throw new ArgumentNullException("id");
+
+            return string.Format("{0}{1}", GetCacheTypeKey(), id);
+        }
+
+        protected string GetCacheTypeKey()
+        {
+            return string.Format("uRepo_{0}_", typeof(TEntity).Name);
+        }
+
+        public override void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod)
+        {
+            if (entity == null) throw new ArgumentNullException("entity");
+            if (persistMethod == null) throw new ArgumentNullException("persistMethod");
+
+            try
+            {
+                persistMethod(entity);
+
+                //set the disposal action                
+                SetCacheAction(() =>
+                {
+                    //just to be safe, we cannot cache an item without an identity
+                    if (entity.HasIdentity)
+                    {
+                        Cache.InsertCacheItem(GetCacheIdKey(entity.Id), () => entity,
+                            timeout: TimeSpan.FromMinutes(5),
+                            isSliding: true);
+                    }
+                    
+                    //If there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                    Cache.ClearCacheItem(GetCacheTypeKey());
+                });
+                
+            }
+            catch
+            {
+                //set the disposal action                
+                SetCacheAction(() =>
+                {
+                    //if an exception is thrown we need to remove the entry from cache, this is ONLY a work around because of the way
+                    // that we cache entities: http://issues.umbraco.org/issue/U4-4259
+                    Cache.ClearCacheItem(GetCacheIdKey(entity.Id));
+
+                    //If there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                    Cache.ClearCacheItem(GetCacheTypeKey());
+                });
+                
+                throw;
+            }
+        }
+
+        public override void Remove(TEntity entity, Action<TEntity> persistMethod)
+        {
+            if (entity == null) throw new ArgumentNullException("entity");
+            if (persistMethod == null) throw new ArgumentNullException("persistMethod");
+
+            try
+            {
+                persistMethod(entity);
+            }
+            finally
+            {
+                //set the disposal action
+                var cacheKey = GetCacheIdKey(entity.Id);
+                SetCacheAction(() =>
+                {
+                    Cache.ClearCacheItem(cacheKey);
+                    //If there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                    Cache.ClearCacheItem(GetCacheTypeKey());
+                });
+            }
+        }
+
+        public override TEntity Get(TId id, Func<TId, TEntity> getFromRepo)
+        {
+            if (getFromRepo == null) throw new ArgumentNullException("getFromRepo");
+
+            var cacheKey = GetCacheIdKey(id);
+            var fromCache = Cache.GetCacheItem<TEntity>(cacheKey);
+            if (fromCache != null)
+                return fromCache;
+            
+            var entity = getFromRepo(id);
+
+            //set the disposal action
+            SetCacheAction(cacheKey, entity);
+
+            return entity;
+        }
+
+        public override TEntity Get(TId id)
+        {
+            var cacheKey = GetCacheIdKey(id);
+            return Cache.GetCacheItem<TEntity>(cacheKey);
+        }
+
+        public override bool Exists(TId id, Func<TId, bool> getFromRepo)
+        {
+            if (getFromRepo == null) throw new ArgumentNullException("getFromRepo");
+
+            var cacheKey = GetCacheIdKey(id);
+            var fromCache = Cache.GetCacheItem<TEntity>(cacheKey);
+            return fromCache != null || getFromRepo(id);
+        }
+
+        public override TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo)            
+        {
+            if (getFromRepo == null) throw new ArgumentNullException("getFromRepo");
+
+            if (ids.Any())
+            {
+                var entities = ids.Select(Get).ToArray();
+                if (ids.Length.Equals(entities.Length) && entities.Any(x => x == null) == false)
+                    return entities;
+            }
+            else
+            {
+                var allEntities = GetAllFromCache();
+                if (allEntities.Any())
+                {
+                    if (_options.GetAllCacheValidateCount)
+                    {
+                        //Get count of all entities of current type (TEntity) to ensure cached result is correct
+                        var totalCount = _options.PerformCount();
+                        if (allEntities.Length == totalCount)
+                            return allEntities;
+                    }
+                    else
+                    {
+                        return allEntities;
+                    }
+                }
+                else if (_options.GetAllCacheAllowZeroCount)
+                {
+                    //if the repository allows caching a zero count, then check the zero count cache
+                    if (HasZeroCountCache())
+                    {
+                        //there is a zero count cache so return an empty list
+                        return new TEntity[] {};
+                    }
+                }
+            }
+
+            //we need to do the lookup from the repo
+            var entityCollection = getFromRepo(ids)
+                //ensure we don't include any null refs in the returned collection!
+                .WhereNotNull()
+                .ToArray();
+
+            //set the disposal action
+            SetCacheAction(ids, entityCollection);
+
+            return entityCollection;
+        }
+
+        /// <summary>
+        /// Looks up the zero count cache, must return null if it doesn't exist
+        /// </summary>
+        /// <returns></returns>
+        protected bool HasZeroCountCache()
+        {
+            var zeroCount = Cache.GetCacheItem<TEntity[]>(GetCacheTypeKey());
+            return (zeroCount != null && zeroCount.Any() == false);
+        }
+
+        /// <summary>
+        /// Performs the lookup for all entities of this type from the cache
+        /// </summary>
+        /// <returns></returns>
+        protected TEntity[] GetAllFromCache()
+        {
+            var allEntities = Cache.GetCacheItemsByKeySearch<TEntity>(GetCacheTypeKey())
+                    .WhereNotNull()
+                    .ToArray();
+            return allEntities.Any() ? allEntities : new TEntity[] {};
+        }       
+
+        /// <summary>
+        /// Sets the action to execute on disposal for a single entity
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="entity"></param>
+        protected virtual void SetCacheAction(string cacheKey, TEntity entity)
+        {
+            if (entity == null) return;
+
+            SetCacheAction(() =>
+            {
+                //just to be safe, we cannot cache an item without an identity
+                if (entity.HasIdentity)
+                {
+                    Cache.InsertCacheItem(cacheKey, () => entity,
+                        timeout: TimeSpan.FromMinutes(5),
+                        isSliding: true);
+                }
+            });
+        }
+
+        /// <summary>
+        /// Sets the action to execute on disposal for an entity collection
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <param name="entityCollection"></param>
+        protected virtual void SetCacheAction(TId[] ids, TEntity[] entityCollection)
+        {
+            SetCacheAction(() =>
+            {
+                //This option cannot execute if we are looking up specific Ids
+                if (ids.Any() == false && entityCollection.Length == 0 && _options.GetAllCacheAllowZeroCount)
+                {
+                    //there was nothing returned but we want to cache a zero count result so add an TEntity[] to the cache
+                    // to signify that there is a zero count cache
+                    //NOTE: Don't set expiry/sliding for a zero count
+                    Cache.InsertCacheItem(GetCacheTypeKey(), () => new TEntity[] {});
+                }
+                else
+                {
+                    //This is the default behavior, we'll individually cache each item so that if/when these items are resolved 
+                    // by id, they are returned from the already existing cache.
+                    foreach (var entity in entityCollection.WhereNotNull())
+                    {
+                        var localCopy = entity;
+                        //just to be safe, we cannot cache an item without an identity
+                        if (localCopy.HasIdentity)
+                        {
+                            Cache.InsertCacheItem(GetCacheIdKey(entity.Id), () => localCopy,
+                                timeout: TimeSpan.FromMinutes(5),
+                                isSliding: true);
+                        }
+                    }
+                }
+            });
+        }
+        
+    }
+}
@@ -0,0 +1,27 @@
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Creates cache policies
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TId"></typeparam>
+    internal class DefaultRepositoryCachePolicyFactory<TEntity, TId> : IRepositoryCachePolicyFactory<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private readonly IRuntimeCacheProvider _runtimeCache;
+        private readonly RepositoryCachePolicyOptions _options;
+
+        public DefaultRepositoryCachePolicyFactory(IRuntimeCacheProvider runtimeCache, RepositoryCachePolicyOptions options)
+        {
+            _runtimeCache = runtimeCache;
+            _options = options;
+        }
+
+        public virtual IRepositoryCachePolicy<TEntity, TId> CreatePolicy()
+        {
+            return new DefaultRepositoryCachePolicy<TEntity, TId>(_runtimeCache, _options);
+        }
+    }
+}
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Collections;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A caching policy that caches an entire dataset as a single collection
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TId"></typeparam>
+    internal class FullDataSetRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private readonly Func<TEntity, TId> _getEntityId;
+        private readonly Func<IEnumerable<TEntity>> _getAllFromRepo;
+        private readonly bool _expires;
+
+        public FullDataSetRepositoryCachePolicy(IRuntimeCacheProvider cache, Func<TEntity, TId> getEntityId, Func<IEnumerable<TEntity>> getAllFromRepo, bool expires)
+            : base(cache)
+        {
+            _getEntityId = getEntityId;
+            _getAllFromRepo = getAllFromRepo;
+            _expires = expires;
+        }
+
+        private bool? _hasZeroCountCache;
+
+
+        protected string GetCacheTypeKey()
+        {
+            return string.Format("uRepo_{0}_", typeof(TEntity).Name);
+        }
+
+        public override void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod)
+        {
+            if (entity == null) throw new ArgumentNullException("entity");
+            if (persistMethod == null) throw new ArgumentNullException("persistMethod");
+
+            try
+            {
+                persistMethod(entity);
+
+                //set the disposal action                
+                SetCacheAction(() =>
+                {
+                    //Clear all
+                    Cache.ClearCacheItem(GetCacheTypeKey());
+                });
+            }
+            catch
+            {
+                //set the disposal action                
+                SetCacheAction(() =>
+                {
+                    //Clear all
+                    Cache.ClearCacheItem(GetCacheTypeKey());
+                });
+                throw;
+            }
+        }
+
+        public override void Remove(TEntity entity, Action<TEntity> persistMethod)
+        {
+            if (entity == null) throw new ArgumentNullException("entity");
+            if (persistMethod == null) throw new ArgumentNullException("persistMethod");
+
+            try
+            {
+                persistMethod(entity);
+            }
+            finally
+            {
+                //set the disposal action
+                SetCacheAction(() =>
+                {
+                    //Clear all
+                    Cache.ClearCacheItem(GetCacheTypeKey());
+                });
+            }
+        }
+
+        public override TEntity Get(TId id, Func<TId, TEntity> getFromRepo)
+        {
+            //Force get all with cache
+            var found = GetAll(new TId[] { }, ids => _getAllFromRepo().WhereNotNull());
+
+            //we don't have anything in cache (this should never happen), just return from the repo
+            if (found == null) return getFromRepo(id);
+            var entity = found.FirstOrDefault(x => _getEntityId(x).Equals(id));
+            if (entity == null) return null;
+
+            //We must ensure to deep clone each one out manually since the deep clone list only clones one way
+            return (TEntity)entity.DeepClone();
+        }
+
+        public override TEntity Get(TId id)
+        {
+            //Force get all with cache
+            var found = GetAll(new TId[] { }, ids => _getAllFromRepo().WhereNotNull());
+
+            //we don't have anything in cache (this should never happen), just return null
+            if (found == null) return null;
+            var entity = found.FirstOrDefault(x => _getEntityId(x).Equals(id));
+            if (entity == null) return null;
+
+            //We must ensure to deep clone each one out manually since the deep clone list only clones one way
+            return (TEntity)entity.DeepClone();
+        }
+
+        public override bool Exists(TId id, Func<TId, bool> getFromRepo)
+        {
+            //Force get all with cache
+            var found = GetAll(new TId[] {}, ids => _getAllFromRepo().WhereNotNull());
+
+            //we don't have anything in cache (this should never happen), just return from the repo
+            return found == null
+                ? getFromRepo(id)
+                : found.Any(x => _getEntityId(x).Equals(id));
+        }
+
+        public override TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo)
+        {
+            //process getting all including setting the cache callback
+            var result = PerformGetAll(getFromRepo);
+
+            //now that the base result has been calculated, they will all be cached. 
+            // Now we can just filter by ids if they have been supplied
+            
+            return (ids.Any() 
+                ? result.Where(x => ids.Contains(_getEntityId(x))).ToArray() 
+                : result)
+                //We must ensure to deep clone each one out manually since the deep clone list only clones one way
+                .Select(x => (TEntity)x.DeepClone())
+                .ToArray();
+        }
+
+        private TEntity[] PerformGetAll(Func<TId[], IEnumerable<TEntity>> getFromRepo)
+        {
+            var allEntities = GetAllFromCache();
+            if (allEntities.Any())
+            {
+                return allEntities;
+            }
+
+            //check the zero count cache
+            if (HasZeroCountCache())
+            {
+                //there is a zero count cache so return an empty list
+                return new TEntity[] { };
+            }
+
+            //we need to do the lookup from the repo
+            var entityCollection = getFromRepo(new TId[] {})
+                //ensure we don't include any null refs in the returned collection!
+                .WhereNotNull()
+                .ToArray();
+
+            //set the disposal action
+            SetCacheAction(entityCollection);
+
+            return entityCollection;
+        }
+
+        /// <summary>
+        /// For this type of caching policy, we don't cache individual items
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="entity"></param>
+        protected void SetCacheAction(string cacheKey, TEntity entity)
+        {
+            //No-op
+        }
+
+        /// <summary>
+        /// Sets the action to execute on disposal for an entity collection
+        /// </summary>
+        /// <param name="entityCollection"></param>
+        protected void SetCacheAction(TEntity[] entityCollection)
+        {
+            //set the disposal action
+            SetCacheAction(() =>
+            {
+                //We want to cache the result as a single collection
+
+                if (_expires)
+                {
+                    Cache.InsertCacheItem(GetCacheTypeKey(), () => new DeepCloneableList<TEntity>(entityCollection),
+                        timeout: TimeSpan.FromMinutes(5),
+                        isSliding: true);
+                }
+                else
+                {
+                    Cache.InsertCacheItem(GetCacheTypeKey(), () => new DeepCloneableList<TEntity>(entityCollection));
+                }
+            });
+        }
+
+        /// <summary>
+        /// Looks up the zero count cache, must return null if it doesn't exist
+        /// </summary>
+        /// <returns></returns>
+        protected bool HasZeroCountCache()
+        {
+            if (_hasZeroCountCache.HasValue)
+                return _hasZeroCountCache.Value;
+
+            _hasZeroCountCache = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetCacheTypeKey()) != null;
+            return _hasZeroCountCache.Value;
+        }
+
+        /// <summary>
+        /// This policy will cache the full data set as a single collection
+        /// </summary>
+        /// <returns></returns>
+        protected TEntity[] GetAllFromCache()
+        {
+            var found = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetCacheTypeKey());
+            
+            //This method will get called before checking for zero count cache, so we'll just set the flag here
+            _hasZeroCountCache = found != null;
+
+            return found == null ? new TEntity[] { } : found.WhereNotNull().ToArray();
+        }
+        
+    }
+}
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Creates cache policies
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TId"></typeparam>
+    internal class FullDataSetRepositoryCachePolicyFactory<TEntity, TId> : IRepositoryCachePolicyFactory<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private readonly IRuntimeCacheProvider _runtimeCache;
+        private readonly Func<TEntity, TId> _getEntityId;
+        private readonly Func<IEnumerable<TEntity>> _getAllFromRepo;
+        private readonly bool _expires;
+
+        public FullDataSetRepositoryCachePolicyFactory(IRuntimeCacheProvider runtimeCache, Func<TEntity, TId> getEntityId, Func<IEnumerable<TEntity>> getAllFromRepo, bool expires)
+        {
+            _runtimeCache = runtimeCache;
+            _getEntityId = getEntityId;
+            _getAllFromRepo = getAllFromRepo;
+            _expires = expires;
+        }
+
+        public virtual IRepositoryCachePolicy<TEntity, TId> CreatePolicy()
+        {
+            return new FullDataSetRepositoryCachePolicy<TEntity, TId>(_runtimeCache, _getEntityId, _getAllFromRepo, _expires);
+        }
+    }
+}
@@ -102,7 +102,7 @@ namespace Umbraco.Core.Cache
                // cannot create value within the lock, so if result.IsValueCreated is false, just
                // do nothing here - means that if creation throws, a race condition could cause
                // more than one thread to reach the return statement below and throw - accepted.
-                
+
                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
                    result = GetSafeLazy(getCacheItem);
@@ -122,7 +122,7 @@ namespace Umbraco.Core.Cache
            if (eh != null) throw eh.Exception; // throw once!
            return value;
        }
-        
+
        #endregion

        #region Insert
@@ -35,7 +35,7 @@ namespace Umbraco.Core.Cache
        {
            const string prefix = CacheItemPrefix + "-";
            return _cache.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string) x.Key).StartsWith(prefix));
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
        }

        protected override void RemoveEntry(string key)
@@ -191,7 +191,7 @@ namespace Umbraco.Core.Cache
            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
            if (value == null) return; // do not store null values (backward compat)

-            cacheKey = GetCacheKey(cacheKey);           
+            cacheKey = GetCacheKey(cacheKey);

            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    internal interface IRepositoryCachePolicy<TEntity, TId> : IDisposable
+        where TEntity : class, IAggregateRoot
+    {
+        TEntity Get(TId id, Func<TId, TEntity> getFromRepo);
+        TEntity Get(TId id);
+        bool Exists(TId id, Func<TId, bool> getFromRepo);
+        
+        void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod);
+        void Remove(TEntity entity, Action<TEntity> persistMethod);
+        TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo);
+    }
+}
@@ -0,0 +1,9 @@
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    internal interface IRepositoryCachePolicyFactory<TEntity, TId> where TEntity : class, IAggregateRoot
+    {
+        IRepositoryCachePolicy<TEntity, TId> CreatePolicy();
+    }
+}
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Concurrent;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Used to get/create/manipulate isolated runtime cache
+    /// </summary>
+    /// <remarks>
+    /// This is useful for repository level caches to ensure that cache lookups by key are fast so 
+    /// that the repository doesn't need to search through all keys on a global scale.
+    /// </remarks>
+    public class IsolatedRuntimeCache
+    {
+        internal Func<Type, IRuntimeCacheProvider> CacheFactory { get; set; }
+
+        /// <summary>
+        /// Constructor that allows specifying a factory for the type of runtime isolated cache to create
+        /// </summary>
+        /// <param name="cacheFactory"></param>
+        public IsolatedRuntimeCache(Func<Type, IRuntimeCacheProvider> cacheFactory)
+        {
+            CacheFactory = cacheFactory;
+        }
+
+        private readonly ConcurrentDictionary<Type, IRuntimeCacheProvider> _isolatedCache = new ConcurrentDictionary<Type, IRuntimeCacheProvider>();
+
+        /// <summary>
+        /// Returns an isolated runtime cache for a given type
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>        
+        public IRuntimeCacheProvider GetOrCreateCache<T>()
+        {
+            return _isolatedCache.GetOrAdd(typeof(T), type => CacheFactory(type));
+        }
+
+        /// <summary>
+        /// Returns an isolated runtime cache for a given type
+        /// </summary>
+        /// <returns></returns>        
+        public IRuntimeCacheProvider GetOrCreateCache(Type type)
+        {
+            return _isolatedCache.GetOrAdd(type, t => CacheFactory(t));
+        }
+
+        /// <summary>
+        /// Tries to get a cache by the type specified
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public Attempt<IRuntimeCacheProvider> GetCache<T>()
+        {
+            IRuntimeCacheProvider cache;
+            if (_isolatedCache.TryGetValue(typeof(T), out cache))
+            {
+                return Attempt.Succeed(cache);
+            }
+            return Attempt<IRuntimeCacheProvider>.Fail();
+        }
+
+        /// <summary>
+        /// Clears all values inside this isolated runtime cache
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public void ClearCache<T>()
+        {
+            IRuntimeCacheProvider cache;
+            if (_isolatedCache.TryGetValue(typeof(T), out cache))
+            {
+                cache.ClearAllCache();
+            }
+        }
+
+        /// <summary>
+        /// Clears all of the isolated caches
+        /// </summary>
+        public void ClearAllCaches()
+        {
+            foreach (var key in _isolatedCache.Keys)
+            {
+                IRuntimeCacheProvider cache;
+                if (_isolatedCache.TryRemove(key, out cache))
+                {
+                    cache.ClearAllCache();
+                }
+            }
+        }
+    }
+}
@@ -49,7 +49,7 @@ namespace Umbraco.Core.Cache
            {
                if (MemoryCache[key] == null) return;
                MemoryCache.Remove(key);
-            }            
+            }
        }

        public virtual void ClearCacheObjectTypes(string typeName)
@@ -137,7 +137,7 @@ namespace Umbraco.Core.Cache
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
                    MemoryCache.Remove(key);
-            }            
+            }
        }

        public virtual void ClearCacheByKeyExpression(string regexString)
@@ -149,7 +149,7 @@ namespace Umbraco.Core.Cache
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
                    MemoryCache.Remove(key);
-            }     
+            }
        }

        #endregion
@@ -201,7 +201,7 @@ namespace Umbraco.Core.Cache
            return GetCacheItem(cacheKey, getCacheItem, null);
        }

-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal,CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
            // see notes in HttpRuntimeCacheProvider

@@ -264,7 +264,7 @@ namespace Umbraco.Core.Cache
            {
                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
            }
-            
+
            if (removedCallback != null)
            {
                policy.RemovedCallback = arguments =>
@@ -295,6 +295,5 @@ namespace Umbraco.Core.Cache
            }
            return policy;
        }
-        
    }
 }
@@ -0,0 +1,27 @@
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Creates cache policies
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TId"></typeparam>
+    internal class OnlySingleItemsRepositoryCachePolicyFactory<TEntity, TId> : IRepositoryCachePolicyFactory<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private readonly IRuntimeCacheProvider _runtimeCache;
+        private readonly RepositoryCachePolicyOptions _options;
+
+        public OnlySingleItemsRepositoryCachePolicyFactory(IRuntimeCacheProvider runtimeCache, RepositoryCachePolicyOptions options)
+        {
+            _runtimeCache = runtimeCache;
+            _options = options;
+        }
+
+        public virtual IRepositoryCachePolicy<TEntity, TId> CreatePolicy()
+        {
+            return new SingleItemsOnlyRepositoryCachePolicy<TEntity, TId>(_runtimeCache, _options);
+        }
+    }
+}
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    internal abstract class RepositoryCachePolicyBase<TEntity, TId> : DisposableObject, IRepositoryCachePolicy<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private Action _action;
+
+        protected RepositoryCachePolicyBase(IRuntimeCacheProvider cache)
+        {
+            if (cache == null) throw new ArgumentNullException("cache");
+            
+            Cache = cache;
+        }
+
+        protected IRuntimeCacheProvider Cache { get; private set; }
+
+        /// <summary>
+        /// The disposal performs the caching
+        /// </summary>
+        protected override void DisposeResources()
+        {
+            if (_action != null)
+            {
+                _action();
+            }
+        }
+
+        /// <summary>
+        /// Sets the action to execute on disposal
+        /// </summary>
+        /// <param name="action"></param>
+        protected void SetCacheAction(Action action)
+        {
+            _action = action;
+        }
+
+        public abstract TEntity Get(TId id, Func<TId, TEntity> getFromRepo);
+        public abstract TEntity Get(TId id);
+        public abstract bool Exists(TId id, Func<TId, bool> getFromRepo);
+        public abstract void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod);
+        public abstract void Remove(TEntity entity, Action<TEntity> persistMethod);
+        public abstract TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo);
+    }
+}
@@ -1,17 +1,34 @@
-namespace Umbraco.Core.Persistence.Repositories
+using System;
+
+namespace Umbraco.Core.Cache
 {
-    internal class RepositoryCacheOptions
+    internal class RepositoryCachePolicyOptions
    {
        /// <summary>
-        /// Constructor sets defaults
+        /// Ctor - sets GetAllCacheValidateCount = true
        /// </summary>
-        public RepositoryCacheOptions()
+        public RepositoryCachePolicyOptions(Func<int> performCount)
        {
+            PerformCount = performCount;
            GetAllCacheValidateCount = true;
            GetAllCacheAllowZeroCount = false;
-            GetAllCacheThresholdLimit = 100;
        }

+        /// <summary>
+        /// Ctor - sets GetAllCacheValidateCount = false
+        /// </summary>
+        public RepositoryCachePolicyOptions()
+        {
+            PerformCount = null;
+            GetAllCacheValidateCount = false;
+            GetAllCacheAllowZeroCount = false;
+        }
+
+        /// <summary>
+        /// Callback required to get count for GetAllCacheValidateCount
+        /// </summary>
+        public Func<int> PerformCount { get; private set; }
+
        /// <summary>
        /// True/false as to validate the total item count when all items are returned from cache, the default is true but this
        /// means that a db lookup will occur - though that lookup will probably be significantly less expensive than the normal 
@@ -21,16 +38,11 @@ namespace Umbraco.Core.Persistence.Repositories
        /// setting this to return false will improve performance of GetAll cache with no params but should only be used
        /// for specific circumstances
        /// </remarks>
-        public bool GetAllCacheValidateCount { get; set; }
+        public bool GetAllCacheValidateCount { get; private set; }

        /// <summary>
        /// True if the GetAll method will cache that there are zero results so that the db is not hit when there are no results found
        /// </summary>
        public bool GetAllCacheAllowZeroCount { get; set; }
-
-        /// <summary>
-        /// The threshold entity count for which the GetAll method will cache entities
-        /// </summary>
-        public int GetAllCacheThresholdLimit { get; set; }
    }
 }
@@ -0,0 +1,24 @@
+using System.Linq;
+using Umbraco.Core.Collections;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A caching policy that ignores all caches for GetAll - it will only cache calls for individual items
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TId"></typeparam>
+    internal class SingleItemsOnlyRepositoryCachePolicy<TEntity, TId> : DefaultRepositoryCachePolicy<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        public SingleItemsOnlyRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options) : base(cache, options)
+        {
+        }
+        
+        protected override void SetCacheAction(TId[] ids, TEntity[] entityCollection)
+        {            
+            //no-op
+        }
+    }
+}
@@ -1,6 +1,8 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -11,20 +13,15 @@ using Umbraco.Core.Logging;

 namespace Umbraco.Core
 {
-
 	/// <summary>
 	/// Class that is exposed by the ApplicationContext for application wide caching purposes
 	/// </summary>
    public class CacheHelper
 	{
-	    private readonly bool _enableCache;
-	    private readonly ICacheProvider _requestCache;
-        private readonly ICacheProvider _nullRequestCache = new NullCacheProvider();
-        private readonly ICacheProvider _staticCache;
-        private readonly ICacheProvider _nullStaticCache = new NullCacheProvider();
-        private readonly IRuntimeCacheProvider _httpCache;
-        private readonly IRuntimeCacheProvider _nullHttpCache = new NullCacheProvider();
-
+        private static readonly ICacheProvider NullRequestCache = new NullCacheProvider();
+        private static readonly ICacheProvider NullStaticCache = new NullCacheProvider();
+        private static readonly IRuntimeCacheProvider NullRuntimeCache = new NullCacheProvider();
+        
        /// <summary>
        /// Creates a cache helper with disabled caches
        /// </summary>
@@ -34,7 +31,7 @@ namespace Umbraco.Core
        /// </remarks>
        public static CacheHelper CreateDisabledCacheHelper()
        {
-            return new CacheHelper(null, null, null, false);
+            return new CacheHelper(NullRuntimeCache, NullStaticCache, NullRequestCache, new IsolatedRuntimeCache(t => NullRuntimeCache));
        }

 	    /// <summary>
@@ -44,7 +41,8 @@ namespace Umbraco.Core
 	        : this(
 	            new HttpRuntimeCacheProvider(HttpRuntime.Cache),
 	            new StaticCacheProvider(),
-                new HttpRequestCacheProvider())
+                new HttpRequestCacheProvider(),
+                new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
 	    {
 	    }

@@ -56,93 +54,75 @@ namespace Umbraco.Core
 	        : this(
 	            new HttpRuntimeCacheProvider(cache),
 	            new StaticCacheProvider(),
-                new HttpRequestCacheProvider())
+                new HttpRequestCacheProvider(),
+                new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
 	    {
 	    }

-	    /// <summary>
-        /// Initializes a new instance based on the provided providers
-        /// </summary>
-        /// <param name="httpCacheProvider"></param>
-        /// <param name="staticCacheProvider"></param>
-        /// <param name="requestCacheProvider"></param>
+	    [Obsolete("Use the constructor the specifies all dependencies")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public CacheHelper(
            IRuntimeCacheProvider httpCacheProvider, 
            ICacheProvider staticCacheProvider, 
            ICacheProvider requestCacheProvider)
-            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, true)
+            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
        {            
        }

-        /// <summary>
-        /// Private ctor used for creating a disabled cache helper
-        /// </summary>
-        /// <param name="httpCacheProvider"></param>
-        /// <param name="staticCacheProvider"></param>
-        /// <param name="requestCacheProvider"></param>
-        /// <param name="enableCache"></param>
-        private CacheHelper(
+	    /// <summary>
+	    /// Initializes a new instance based on the provided providers
+	    /// </summary>
+	    /// <param name="httpCacheProvider"></param>
+	    /// <param name="staticCacheProvider"></param>
+	    /// <param name="requestCacheProvider"></param>
+	    /// <param name="isolatedCacheManager"></param>
+	    public CacheHelper(
            IRuntimeCacheProvider httpCacheProvider,
            ICacheProvider staticCacheProvider,
-            ICacheProvider requestCacheProvider, 
-            bool enableCache)
+            ICacheProvider requestCacheProvider,
+            IsolatedRuntimeCache isolatedCacheManager)            
        {
-            if (enableCache)
-            {
-                _httpCache = httpCacheProvider;
-                _staticCache = staticCacheProvider;
-                _requestCache = requestCacheProvider;
-            }
-            else
-            {
-                _httpCache = null;
-                _staticCache = null;
-                _requestCache = null;
-            }
-
-            _enableCache = enableCache;
+	        if (httpCacheProvider == null) throw new ArgumentNullException("httpCacheProvider");
+	        if (staticCacheProvider == null) throw new ArgumentNullException("staticCacheProvider");
+	        if (requestCacheProvider == null) throw new ArgumentNullException("requestCacheProvider");
+	        if (isolatedCacheManager == null) throw new ArgumentNullException("isolatedCacheManager");
+	        RuntimeCache = httpCacheProvider;
+            StaticCache = staticCacheProvider;
+            RequestCache = requestCacheProvider;
+            IsolatedRuntimeCache = isolatedCacheManager;
        }

        /// <summary>
        /// Returns the current Request cache
        /// </summary>
-        public ICacheProvider RequestCache
-        {
-            get { return _enableCache ? _requestCache : _nullRequestCache; }
-        }
-
-        /// <summary>
-        /// Returns the current Runtime cache
-        /// </summary>
-        public ICacheProvider StaticCache
-        {
-            get { return _enableCache ? _staticCache : _nullStaticCache; }
-        }
-
-        /// <summary>
-        /// Returns the current Runtime cache
-        /// </summary>
-	    public IRuntimeCacheProvider RuntimeCache
-	    {
-	        get { return _enableCache ? _httpCache : _nullHttpCache; }
-	    }
+        public ICacheProvider RequestCache { get; internal set; }
        
-	    #region Legacy Runtime/Http Cache accessors
+        /// <summary>
+        /// Returns the current Runtime cache
+        /// </summary>
+        public ICacheProvider StaticCache { get; internal set; }
+
+        /// <summary>
+        /// Returns the current Runtime cache
+        /// </summary>
+	    public IRuntimeCacheProvider RuntimeCache { get; internal set; }
+
+        /// <summary>
+        /// Returns the current Isolated Runtime cache manager
+        /// </summary>
+        public IsolatedRuntimeCache IsolatedRuntimeCache { get; internal set; }
+
+        #region Legacy Runtime/Http Cache accessors

        /// <summary>
        /// Clears the item in umbraco's runtime cache
        /// </summary>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void ClearAllCache()
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.ClearAllCache();
-            }
-            else
-            {
-                _httpCache.ClearAllCache();
-            }
+            RuntimeCache.ClearAllCache();
+            IsolatedRuntimeCache.ClearAllCaches();
        }

        /// <summary>
@@ -150,16 +130,10 @@ namespace Umbraco.Core
        /// </summary>
        /// <param name="key">Key</param>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void ClearCacheItem(string key)
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.ClearCacheItem(key);
-            }
-            else
-            {
-                _httpCache.ClearCacheItem(key);
-            }
+            RuntimeCache.ClearCacheItem(key);
        }


@@ -171,30 +145,17 @@ namespace Umbraco.Core
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
        public void ClearCacheObjectTypes(string typeName)
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.ClearCacheObjectTypes(typeName);
-            }
-            else
-            {
-                _httpCache.ClearCacheObjectTypes(typeName);
-            }
+            RuntimeCache.ClearCacheObjectTypes(typeName);
        }

        /// <summary>
        /// Clears all objects in the System.Web.Cache with the System.Type specified
        /// </summary>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void ClearCacheObjectTypes<T>()
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.ClearCacheObjectTypes<T>();
-            }
-            else
-            {
-                _httpCache.ClearCacheObjectTypes<T>();
-            }
+            RuntimeCache.ClearCacheObjectTypes<T>();
        }

        /// <summary>
@@ -202,16 +163,10 @@ namespace Umbraco.Core
        /// </summary>
        /// <param name="keyStartsWith">The start of the key</param>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void ClearCacheByKeySearch(string keyStartsWith)
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.ClearCacheByKeySearch(keyStartsWith);
-            }
-            else
-            {
-                _httpCache.ClearCacheByKeySearch(keyStartsWith);
-            }
+            RuntimeCache.ClearCacheByKeySearch(keyStartsWith);
        }

        /// <summary>
@@ -219,29 +174,17 @@ namespace Umbraco.Core
        /// </summary>
        /// <param name="regexString"></param>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void ClearCacheByKeyExpression(string regexString)
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.ClearCacheByKeyExpression(regexString);
-            }
-            else
-            {
-                _httpCache.ClearCacheByKeyExpression(regexString);
-            }
+            RuntimeCache.ClearCacheByKeyExpression(regexString);
        }

        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
        {
-            if (_enableCache == false)
-            {
-                return _nullHttpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-            }
-            else
-            {
-                return _httpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-            }
+            return RuntimeCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
        }

        /// <summary>
@@ -251,16 +194,10 @@ namespace Umbraco.Core
        /// <param name="cacheKey"></param>
        /// <returns></returns>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public TT GetCacheItem<TT>(string cacheKey)
        {
-            if (_enableCache == false)
-            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey);
-            }
-            else
-            {
-                return _httpCache.GetCacheItem<TT>(cacheKey);
-            }
+            return RuntimeCache.GetCacheItem<TT>(cacheKey);
        }

        /// <summary>
@@ -271,16 +208,11 @@ namespace Umbraco.Core
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
-            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-            }
-            else
-            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-            }
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+
        }

        /// <summary>
@@ -292,17 +224,12 @@ namespace Umbraco.Core
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public TT GetCacheItem<TT>(string cacheKey,
            TimeSpan timeout, Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
-            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
-            }
-            else
-            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
-            }
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
+
        }

        /// <summary>
@@ -315,18 +242,13 @@ namespace Umbraco.Core
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (!_enableCache)
-            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
-            }
-            else
-            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
-            }
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
+
        }

        /// <summary>
@@ -340,18 +262,13 @@ namespace Umbraco.Core
        /// <param name="getCacheItem"></param>
        /// <returns></returns>
        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public TT GetCacheItem<TT>(string cacheKey,
            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
-            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
-            }
-            else
-            {
-                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
-            }
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
+
        }

        /// <summary>
@@ -373,20 +290,13 @@ namespace Umbraco.Core
            TimeSpan timeout,
            Func<TT> getCacheItem)
        {
-            if (_enableCache == false)
+            var cache = RuntimeCache as HttpRuntimeCacheProvider;
+            if (cache != null)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
-            }
-            else
-            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
-                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
        }

        /// <summary>
@@ -404,20 +314,13 @@ namespace Umbraco.Core
            CacheDependency cacheDependency,
            Func<TT> getCacheItem)
        {
-            if (!_enableCache)
+            var cache = RuntimeCache as HttpRuntimeCacheProvider;
+            if (cache != null)
            {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, null, false, priority, null, null);
-            }
-            else
-            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
-                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
+                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
        }

        /// <summary>
@@ -427,18 +330,14 @@ namespace Umbraco.Core
        /// <param name="cacheKey"></param>
        /// <param name="priority"></param>
        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void InsertCacheItem<T>(string cacheKey,
                                       CacheItemPriority priority,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
-            }
-            else
-            {
-                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
-            }
+            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
+
        }

        /// <summary>
@@ -449,19 +348,14 @@ namespace Umbraco.Core
        /// <param name="priority"></param>
        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public void InsertCacheItem<T>(string cacheKey,
                                       CacheItemPriority priority,
                                       TimeSpan timeout,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
-            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
-            }
-            else
-            {
-                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
-            }
+            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
        }

        /// <summary>
@@ -480,19 +374,12 @@ namespace Umbraco.Core
                                       TimeSpan timeout,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
+            var cache = RuntimeCache as HttpRuntimeCacheProvider;
+            if (cache != null)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority, dependentFiles:null);
-            }
-            else
-            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
        }

        /// <summary>
@@ -513,19 +400,12 @@ namespace Umbraco.Core
                                       TimeSpan? timeout,
                                       Func<T> getCacheItem)
        {
-            if (_enableCache == false)
+            var cache = RuntimeCache as HttpRuntimeCacheProvider;
+            if (cache != null)
            {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
-            }
-            else
-            {
-                var cache = _httpCache as HttpRuntimeCacheProvider;
-                if (cache != null)
-                {
-                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
-                }
-                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
        } 
        #endregion

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// A List that can be deep cloned with deep cloned elements and can reset the collection's items dirty flags
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class DeepCloneableList<T> : List<T>, IDeepCloneable, IRememberBeingDirty
+    {
+        private readonly ListCloneBehavior _listCloneBehavior;
+        
+        public DeepCloneableList(ListCloneBehavior listCloneBehavior)
+        {
+            _listCloneBehavior = listCloneBehavior;
+        }
+        
+        public DeepCloneableList(IEnumerable<T> collection, ListCloneBehavior listCloneBehavior) : base(collection)
+        {
+            _listCloneBehavior = listCloneBehavior;
+        }
+
+        /// <summary>
+        /// Default behavior is CloneOnce
+        /// </summary>
+        /// <param name="collection"></param>
+        public DeepCloneableList(IEnumerable<T> collection)
+            : this(collection, ListCloneBehavior.CloneOnce)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new list and adds each element as a deep cloned element if it is of type IDeepCloneable
+        /// </summary>
+        /// <returns></returns>
+        public object DeepClone()
+        {
+            switch (_listCloneBehavior)
+            {
+                case ListCloneBehavior.CloneOnce:
+                    //we are cloning once, so create a new list in none mode
+                    // and deep clone all items into it
+                    var newList = new DeepCloneableList<T>(ListCloneBehavior.None);
+                    foreach (var item in this)
+                    {
+                        var dc = item as IDeepCloneable;
+                        if (dc != null)
+                        {
+                            newList.Add((T)dc.DeepClone());
+                        }
+                        else
+                        {
+                            newList.Add(item);
+                        }
+                    }
+                    return newList;
+                case ListCloneBehavior.None:
+                    //we are in none mode, so just return a new list with the same items
+                    return new DeepCloneableList<T>(this, ListCloneBehavior.None);
+                case ListCloneBehavior.Always:
+                    //always clone to new list
+                    var newList2 = new DeepCloneableList<T>(ListCloneBehavior.Always);
+                    foreach (var item in this)
+                    {
+                        var dc = item as IDeepCloneable;
+                        if (dc != null)
+                        {
+                            newList2.Add((T)dc.DeepClone());
+                        }
+                        else
+                        {
+                            newList2.Add(item);
+                        }
+                    }
+                    return newList2;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        public bool IsDirty()
+        {
+            return this.OfType<IRememberBeingDirty>().Any(x => x.IsDirty());
+        }
+
+        public bool WasDirty()
+        {
+            return this.OfType<IRememberBeingDirty>().Any(x => x.WasDirty());
+        }
+
+        /// <summary>
+        /// Always returns false, the list has no properties we need to report
+        /// </summary>
+        /// <param name="propName"></param>
+        /// <returns></returns>
+        public bool IsPropertyDirty(string propName)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Always returns false, the list has no properties we need to report
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <returns></returns>
+        public bool WasPropertyDirty(string propertyName)
+        {
+            return false;
+        }
+
+        public void ResetDirtyProperties()
+        {
+            foreach (var dc in this.OfType<IRememberBeingDirty>())
+            {
+                dc.ResetDirtyProperties();
+            }
+        }
+
+        public void ForgetPreviouslyDirtyProperties()
+        {
+            foreach (var dc in this.OfType<IRememberBeingDirty>())
+            {
+                dc.ForgetPreviouslyDirtyProperties();
+            }
+        }
+
+        public void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            foreach (var dc in this.OfType<IRememberBeingDirty>())
+            {
+                dc.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+            }
+        }
+    }
+}
@@ -0,0 +1,20 @@
+namespace Umbraco.Core.Collections
+{
+    internal enum ListCloneBehavior
+    {
+        /// <summary>
+        /// When set, DeepClone will clone the items one time and the result list behavior will be None
+        /// </summary>
+        CloneOnce,
+
+        /// <summary>
+        /// When set, DeepClone will not clone any items
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// When set, DeepClone will always clone all items
+        /// </summary>
+        Always
+    }
+}
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Configuration
        //make this volatile so that we can ensure thread safety with a double check lock
    	private static volatile string _reservedUrlsCache;
        private static string _reservedPathsCache;
-        private static StartsWithContainer _reservedList = new StartsWithContainer();
+        private static HashSet<string> _reservedList = new HashSet<string>();
        private static string _reservedPaths;
        private static string _reservedUrls;
        //ensure the built on (non-changeable) reserved paths are there at all times
@@ -242,6 +242,7 @@ namespace Umbraco.Core.Configuration
            }
        }

+        //TODO: Move these to constants!
        public const string UmbracoConnectionName = "umbracoDbDSN";
        public const string UmbracoMigrationName = "Umbraco";

@@ -420,14 +421,15 @@ namespace Umbraco.Core.Configuration
        /// Gets a value indicating whether the current version of umbraco is configured.
        /// </summary>
        /// <value><c>true</c> if configured; otherwise, <c>false</c>.</value>
-        public static bool Configured
+        [Obsolete("Do not use this, it is no longer in use and will be removed from the codebase in future versions")]
+        internal static bool Configured
        {
            get
            {
                try
                {
                    string configStatus = ConfigurationStatus;
-                    string currentVersion = UmbracoVersion.Current.ToString(3);
+                    string currentVersion = UmbracoVersion.GetSemanticVersion().ToSemanticString();


                    if (currentVersion != configStatus)
@@ -594,10 +596,7 @@ namespace Umbraco.Core.Configuration
        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
        public static string CurrentVersion
        {
-            get
-            {
-                return UmbracoVersion.Current.ToString(3);
-            }
+            get { return UmbracoVersion.GetSemanticVersion().ToSemanticString(); }
        }

        /// <summary>
@@ -768,38 +767,31 @@ namespace Umbraco.Core.Configuration
                        // store references to strings to determine changes
                        _reservedPathsCache = GlobalSettings.ReservedPaths;
                        _reservedUrlsCache = GlobalSettings.ReservedUrls;
-
-                        string _root = SystemDirectories.Root.Trim().ToLower();
-
+                        
                        // add URLs and paths to a new list
-                        StartsWithContainer _newReservedList = new StartsWithContainer();
-                        foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                        var newReservedList = new HashSet<string>();
+                        foreach (var reservedUrlTrimmed in _reservedUrlsCache
+                            .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+                            .Select(x => x.Trim().ToLowerInvariant())
+                            .Where(x => x.IsNullOrWhiteSpace() == false)
+                            .Select(reservedUrl => IOHelper.ResolveUrl(reservedUrl).Trim().EnsureStartsWith("/"))
+                            .Where(reservedUrlTrimmed => reservedUrlTrimmed.IsNullOrWhiteSpace() == false))
                        {
-                            if (string.IsNullOrWhiteSpace(reservedUrl))
-                               continue;
-                            
-
-                            //resolves the url to support tilde chars
-                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl.Trim()).Trim().ToLower();
-                            if (reservedUrlTrimmed.Length > 0)
-                                _newReservedList.Add(reservedUrlTrimmed);
+                            newReservedList.Add(reservedUrlTrimmed);
                        }

-                        foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                        foreach (var reservedPathTrimmed in _reservedPathsCache
+                            .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+                            .Select(x => x.Trim().ToLowerInvariant())
+                            .Where(x => x.IsNullOrWhiteSpace() == false)
+                            .Select(reservedPath => IOHelper.ResolveUrl(reservedPath).Trim().EnsureStartsWith("/").EnsureEndsWith("/"))
+                            .Where(reservedPathTrimmed => reservedPathTrimmed.IsNullOrWhiteSpace() == false))
                        {
-                            bool trimEnd = !reservedPath.EndsWith("/");
-                            if (string.IsNullOrWhiteSpace(reservedPath))
-                                continue;
-                           
-                            //resolves the url to support tilde chars
-                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath.Trim()).Trim().ToLower();
-
-                            if (reservedPathTrimmed.Length > 0)
-                                _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));
+                            newReservedList.Add(reservedPathTrimmed);
                        }

                        // use the new list from now on
-                        _reservedList = _newReservedList;
+                        _reservedList = newReservedList;
                    }
                }
            }
@@ -807,107 +799,17 @@ namespace Umbraco.Core.Configuration
            //The url should be cleaned up before checking:
            // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
            // * We shouldn't be comparing the query at all
-            var pathPart = url.Split('?')[0];
-            if (!pathPart.Contains(".") && !pathPart.EndsWith("/"))
+            var pathPart = url.Split(new[] {'?'}, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
+            if (pathPart.Contains(".") == false)
            {
-                pathPart += "/";
+                pathPart = pathPart.EnsureEndsWith('/');
            }

            // return true if url starts with an element of the reserved list
-            return _reservedList.StartsWith(pathPart.ToLowerInvariant());
+            return _reservedList.Any(x => pathPart.InvariantStartsWith(x));
        }

-        /// <summary>
-        /// Structure that checks in logarithmic time
-        /// if a given string starts with one of the added keys.
-        /// </summary>
-        private class StartsWithContainer
-        {
-            /// <summary>Internal sorted list of keys.</summary>
-            public SortedList<string, string> _list
-                = new SortedList<string, string>(StartsWithComparator.Instance);
-
-            /// <summary>
-            /// Adds the specified new key.
-            /// </summary>
-            /// <param name="newKey">The new key.</param>
-            public void Add(string newKey)
-            {
-                // if the list already contains an element that begins with newKey, return
-                if (String.IsNullOrEmpty(newKey) || StartsWith(newKey))
-                    return;
-
-                // create a new collection, so the old one can still be accessed
-                SortedList<string, string> newList
-                    = new SortedList<string, string>(_list.Count + 1, StartsWithComparator.Instance);
-
-                // add only keys that don't already start with newKey, others are unnecessary
-                foreach (string key in _list.Keys)
-                    if (!key.StartsWith(newKey))
-                        newList.Add(key, null);
-                // add the new key
-                newList.Add(newKey, null);
-
-                // update the list (thread safe, _list was never in incomplete state)
-                _list = newList;
-            }
-
-            /// <summary>
-            /// Checks if the given string starts with any of the added keys.
-            /// </summary>
-            /// <param name="target">The target.</param>
-            /// <returns>true if a key is found that matches the start of target</returns>
-            /// <remarks>
-            /// Runs in O(s*log(n)), with n the number of keys and s the length of target.
-            /// </remarks>
-            public bool StartsWith(string target)
-            {
-                return _list.ContainsKey(target);
-            }
-
-            /// <summary>Comparator that tests if a string starts with another.</summary>
-            /// <remarks>Not a real comparator, since it is not reflexive. (x==y does not imply y==x)</remarks>
-            private sealed class StartsWithComparator : IComparer<string>
-            {
-                /// <summary>Default string comparer.</summary>
-                private readonly static Comparer<string> _stringComparer = Comparer<string>.Default;
-
-                /// <summary>Gets an instance of the StartsWithComparator.</summary>
-                public static readonly StartsWithComparator Instance = new StartsWithComparator();
-
-                /// <summary>
-                /// Tests if whole begins with all characters of part.
-                /// </summary>
-                /// <param name="part">The part.</param>
-                /// <param name="whole">The whole.</param>
-                /// <returns>
-                /// Returns 0 if whole starts with part, otherwise performs standard string comparison.
-                /// </returns>
-                public int Compare(string part, string whole)
-                {
-                    // let the default string comparer deal with null or when part is not smaller then whole
-                    if (part == null || whole == null || part.Length >= whole.Length)
-                        return _stringComparer.Compare(part, whole);
-
-                    ////ensure both have a / on the end
-                    //part = part.EndsWith("/") ? part : part + "/"; 
-                    //whole = whole.EndsWith("/") ? whole : whole + "/";
-                    //if (part.Length >= whole.Length)
-                    //    return _stringComparer.Compare(part, whole);
-
-                    // loop through all characters that part and whole have in common
-                    int pos = 0;
-                    bool match;
-                    do
-                    {
-                        match = (part[pos] == whole[pos]);
-                    } while (match && ++pos < part.Length);
-
-                    // return result of last comparison
-                    return match ? 0 : (part[pos] < whole[pos] ? -1 : 1);
-                }
-            }
-        }
+      

    }

@@ -0,0 +1,16 @@
+using System.IO;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    class GridConfig : IGridConfig
+    {
+        public GridConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+        {
+            EditorsConfig = new GridEditorsConfig(logger, runtimeCache, appPlugins, configFolder, isDebug);
+        }
+
+        public IGridEditorsConfig EditorsConfig { get; private set; }
+    }
+}
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    class GridEditorsConfig : IGridEditorsConfig
+    {
+        private readonly ILogger _logger;
+        private readonly IRuntimeCacheProvider _runtimeCache;
+        private readonly DirectoryInfo _appPlugins;
+        private readonly DirectoryInfo _configFolder;
+        private readonly bool _isDebug;
+
+        public GridEditorsConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+        {
+            _logger = logger;
+            _runtimeCache = runtimeCache;
+            _appPlugins = appPlugins;
+            _configFolder = configFolder;
+            _isDebug = isDebug;
+        }
+
+        public IEnumerable<IGridEditorConfig> Editors
+        {
+            get
+            {
+                Func<List<GridEditor>> getResult = () =>
+                {
+                    var editors = new List<GridEditor>();
+                    var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
+                    if (File.Exists(gridConfig))
+                    {
+                        try
+                        {
+                            var arr = JArray.Parse(File.ReadAllText(gridConfig));
+                            //ensure the contents parse correctly to objects
+                            var parsed = ManifestParser.GetGridEditors(arr);
+                            editors.AddRange(parsed);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<GridEditorsConfig>("Could not parse the contents of grid.editors.config.js into a JSON array", ex);
+                        }
+                    }
+
+                    var parser = new ManifestParser(_appPlugins, _runtimeCache);
+                    var builder = new ManifestBuilder(_runtimeCache, parser);
+                    foreach (var gridEditor in builder.GridEditors)
+                    {
+                        //no duplicates! (based on alias)
+                        if (editors.Contains(gridEditor) == false)
+                        {
+                            editors.Add(gridEditor);
+                        }
+                    }
+                    return editors;
+                };
+
+                //cache the result if debugging is disabled
+                var result = _isDebug
+                    ? getResult()
+                    : _runtimeCache.GetCacheItem<List<GridEditor>>(
+                        typeof(GridEditorsConfig) + "Editors",
+                        () => getResult(),
+                        TimeSpan.FromMinutes(10));
+
+                return result;
+            }
+            
+        }
+    }
+}
@@ -0,0 +1,14 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    public interface IGridConfig
+    {
+
+        IGridEditorsConfig EditorsConfig { get; }
+
+    }
+}
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    public interface IGridEditorConfig
+    {
+        string Name { get; }
+        string Alias { get; }
+        string View { get; }
+        string Render { get; }
+        string Icon { get; }
+        IDictionary<string, object> Config { get; }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    public interface IGridEditorsConfig
+    {
+        IEnumerable<IGridEditorConfig> Editors { get; }
+    }
+}
@@ -2,10 +2,13 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Threading;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.BaseRest;
 using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;

@@ -67,6 +70,7 @@ namespace Umbraco.Core.Configuration
        private IDashboardSection _dashboardSection;
        private IUmbracoSettingsSection _umbracoSettings;
        private IBaseRestSection _baseRestExtensions;
+        private IGridConfig _gridConfig;

        /// <summary>
        /// Gets the IDashboardSection
@@ -140,6 +144,28 @@ namespace Umbraco.Core.Configuration
            return _baseRestExtensions;
        }

+        /// <summary>
+        /// Only for testing
+        /// </summary>
+        /// <param name="value"></param>
+        public void SetGridConfig(IGridConfig value)
+        {
+            _gridConfig = value;
+        }
+
+        /// <summary>
+        /// Gets the IGridConfig
+        /// </summary>
+        public IGridConfig GridConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+        {
+            if (_gridConfig == null)
+            {
+                _gridConfig = new GridConfig(logger, runtimeCache, appPlugins, configFolder, isDebug);
+            }
+
+            return _gridConfig;
+        }
+
        //TODO: Add other configurations here !
    }
 }
@@ -11,6 +11,8 @@
        bool DisableFindContentByIdPath { get; }

        string UrlProviderMode { get; }
+
+        string UmbracoApplicationUrl { get; }
    }

 }
@@ -30,8 +30,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
        public string UrlProviderMode
        {
-            get { return (string)base["urlProviderMode"]; }
+            get { return (string) base["urlProviderMode"]; }
        }

+        [ConfigurationProperty("umbracoApplicationUrl", DefaultValue = null)]
+        public string UmbracoApplicationUrl
+        {
+            get { return (string)base["umbracoApplicationUrl"]; }
+        }
    }
 }
@@ -1,11 +1,12 @@
 using System;
 using System.Reflection;
+using Semver;

 namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.3.0");
+        private static readonly Version Version = new Version("7.3.7");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -23,10 +24,20 @@ namespace Umbraco.Core.Configuration
        /// Gets the version comment (like beta or RC).
        /// </summary>
        /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "beta"; } }
+        public static string CurrentComment { get { return ""; } }

        // Get the version of the umbraco.dll by looking at a class in that dll
        // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
        public static string AssemblyVersion { get { return new AssemblyName(typeof(ActionsResolver).Assembly.FullName).Version.ToString(); } }
+
+        public static SemVersion GetSemanticVersion()
+        {
+            return new SemVersion(
+                Current.Major, 
+                Current.Minor,
+                Current.Build, 
+                CurrentComment.IsNullOrWhiteSpace() ? null : CurrentComment,
+                Current.Revision > 0 ? Current.Revision.ToInvariantString() : null);
+        }
    }
 }
@@ -43,7 +43,7 @@
 			public const string Users = "users";

            /// <summary>
-            /// Application alias for the users section.
+            /// Application alias for the forms section.
            /// </summary>
            public const string Forms = "forms";
 		}
@@ -27,6 +27,7 @@ namespace Umbraco.Core
                /// <summary>
                /// The root id for all top level dictionary items
                /// </summary>
+                [Obsolete("There is no dictionary root item id anymore, it is simply null")]
                public const string DictionaryItemRootId = "41c7638d-f529-4bff-853e-59a0c2fb1bde";
 		    }

@@ -205,7 +206,7 @@ namespace Umbraco.Core
                /// </summary>
                internal const string StandardPropertiesGroupName = "Membership";

-		        internal static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
+		        public static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
 		        {
 		            return new Dictionary<string, PropertyType>
 		                {
@@ -2,91 +2,96 @@

 namespace Umbraco.Core
 {
-	public static partial class Constants
-	{
-		/// <summary>
-		/// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
-		/// </summary>
-		public static class ObjectTypes
-		{
-			/// <summary>
-			/// Guid for a Content Item object.
-			/// </summary>
-			public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
+        /// </summary>
+        public static class ObjectTypes
+        {
+            /// <summary>
+            /// Guid for a Content Item object.
+            /// </summary>
+            public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";

-			/// <summary>
-			/// Guid for a Content Item Type object.
-			/// </summary>
-			public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";
+            /// <summary>
+            /// Guid for a Content Item Type object.
+            /// </summary>
+            public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";

-			/// <summary>
-			/// Guid for the Content Recycle Bin.
-			/// </summary>
-			public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";
+            /// <summary>
+            /// Guid for the Content Recycle Bin.
+            /// </summary>
+            public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";

-			/// <summary>
-			/// Guid for a DataType object.
-			/// </summary>
-			public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";
+            /// <summary>
+            /// Guid for a DataType object.
+            /// </summary>
+            public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";

-			/// <summary>
-			/// Guid for a Document object.
-			/// </summary>
-			public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
+            /// <summary>
+            /// Guid for a Document object.
+            /// </summary>
+            public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";

-			/// <summary>
-			/// Guid for a Document Type object.
-			/// </summary>
-			public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";
+            /// <summary>
+            /// Guid for a Document Type object.
+            /// </summary>
+            public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";

-			/// <summary>
-			/// Guid for a Media object.
-			/// </summary>
-			public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";
+            /// <summary>
+            /// Guid for a Media object.
+            /// </summary>
+            public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";

-			/// <summary>
-			/// Guid for the Media Recycle Bin.
-			/// </summary>
-			public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";
+            /// <summary>
+            /// Guid for the Media Recycle Bin.
+            /// </summary>
+            public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";

-			/// <summary>
-			/// Guid for a Media Type object.
-			/// </summary>
-			public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";
+            /// <summary>
+            /// Guid for a Media Type object.
+            /// </summary>
+            public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";

-			/// <summary>
-			/// Guid for a Member object.
-			/// </summary>
-			public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";
+            /// <summary>
+            /// Guid for a Member object.
+            /// </summary>
+            public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";

-			/// <summary>
-			/// Guid for a Member Group object.
-			/// </summary>
-			public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";
+            /// <summary>
+            /// Guid for a Member Group object.
+            /// </summary>
+            public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";

-			/// <summary>
-			/// Guid for a Member Type object.
-			/// </summary>
-			public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";
+            /// <summary>
+            /// Guid for a Member Type object.
+            /// </summary>
+            public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";

-			/// <summary>
-			/// Guid for a Stylesheet object.
-			/// </summary>
+            /// <summary>
+            /// Guid for a Stylesheet object.
+            /// </summary>
            [Obsolete("This no longer exists in the database")]
            public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840";

            [Obsolete("This no longer exists in the database")]
            internal const string StylesheetProperty = "5555da4f-a123-42b2-4488-dcdfb25e4111";

-			/// <summary>
-			/// Guid for the System Root.
-			/// </summary>
-			public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";
+            /// <summary>
+            /// Guid for the System Root.
+            /// </summary>
+            public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";

-			/// <summary>
-			/// Guid for a Template object.
-			/// </summary>
-			public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
-		}
-	}
+            /// <summary>
+            /// Guid for a Template object.
+            /// </summary>
+            public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
+
+            /// <summary>
+            /// Guid for a Lock object.
+            /// </summary>
+            public const string LockObject = "87A9F1FF-B1E4-4A25-BABB-465A4A47EC41";
+        }
+    }
 }
@@ -310,13 +310,13 @@ namespace Umbraco.Core
            public const string TextboxAlias = "Umbraco.Textbox";

            /// <summary>
-            /// Guid for the Textbox multiple datatype.
+            /// Guid for the Textarea datatype.
            /// </summary>
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string TextboxMultiple = "67DB8357-EF57-493E-91AC-936D305E0F2A";

            /// <summary>
-            /// Alias for the Textbox multiple datatype.
+            /// Alias for the Textarea datatype.
            /// </summary>
            public const string TextboxMultipleAlias = "Umbraco.TextboxMultiple";

@@ -26,6 +26,8 @@
            public const int DefaultMediaListViewDataTypeId = -96;
            public const int DefaultMembersListViewDataTypeId = -97;

+            // identifiers for lock objects
+		    public const int ServersLock = -331;
 		}
 	}
 }
@@ -1,4 +1,7 @@
-namespace Umbraco.Core
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core
 {
 	public static partial class Constants
 	{		
@@ -15,6 +18,8 @@
            /// <summary>
            /// The auth cookie name
            /// </summary>
+            [Obsolete("DO NOT USE THIS, USE ISecuritySection.AuthCookieName, this will be removed in future versions")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
            public const string AuthCookieName = "UMB_UCONTEXT";

        }
@@ -26,6 +31,7 @@
 	        public const string BackOfficeExternalAuthenticationType = "UmbracoExternalCookie";
            public const string BackOfficeExternalCookieName = "UMB_EXTLOGIN";
            public const string BackOfficeTokenAuthenticationType = "UmbracoBackOfficeToken";
+            public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";

            /// <summary>
            /// The prefix used for external identity providers for their authentication type
@@ -2,10 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Web;
 using AutoMapper;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Events;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Mapping;
@@ -39,15 +42,15 @@ namespace Umbraco.Core
    /// </remarks>
    public class CoreBootManager : IBootManager
    {
-        private ProfilingLogger _profilingLogger;
+        protected ProfilingLogger ProfilingLogger { get; private set; }
        private DisposableTimer _timer;
        private bool _isInitialized = false;
        private bool _isStarted = false;
        private bool _isComplete = false;
        private readonly IServiceProvider _serviceProvider = new ActivatorServiceProvider();
        private readonly UmbracoApplicationBase _umbracoApplication;
-        protected ApplicationContext ApplicationContext { get; set; }
-        protected CacheHelper ApplicationCache { get; set; }
+        protected ApplicationContext ApplicationContext { get; private set; }
+        protected CacheHelper ApplicationCache { get; private set; }
        protected PluginManager PluginManager { get; private set; }

        protected UmbracoApplicationBase UmbracoApplication
@@ -66,6 +69,14 @@ namespace Umbraco.Core
            _umbracoApplication = umbracoApplication;
        }

+        internal CoreBootManager(UmbracoApplicationBase umbracoApplication, ProfilingLogger logger)
+        {
+            if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
+            if (logger == null) throw new ArgumentNullException("logger");
+            _umbracoApplication = umbracoApplication;
+            ProfilingLogger = logger;
+        }
+
        public virtual IBootManager Initialize()
        {
            if (_isInitialized)
@@ -74,15 +85,17 @@ namespace Umbraco.Core
            InitializeLoggerResolver();
            InitializeProfilerResolver();

-            _profilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
+            ProfilingLogger = ProfilingLogger?? new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);

-            _timer = _profilingLogger.TraceDuration<CoreBootManager>("Umbraco application starting", "Umbraco application startup complete");
+            _timer = ProfilingLogger.TraceDuration<CoreBootManager>(
+                string.Format("Umbraco {0} application starting on {1}", UmbracoVersion.GetSemanticVersion().ToSemanticString(), NetworkHelper.MachineName),
+                "Umbraco application startup complete");

-            CreateApplicationCache();
+            ApplicationCache = CreateApplicationCache();

            //create and set the plugin manager (I'd much prefer to not use this singleton anymore but many things are using it unfortunately and
            // the way that it is setup, there must only ever be one per app so without IoC it would be hard to make this not a singleton)
-            PluginManager = new PluginManager(ServiceProvider, ApplicationCache.RuntimeCache, _profilingLogger);
+            PluginManager = new PluginManager(ServiceProvider, ApplicationCache.RuntimeCache, ProfilingLogger);
            PluginManager.Current = PluginManager;

            //Create the legacy prop-eds mapping
@@ -90,38 +103,51 @@ namespace Umbraco.Core
            LegacyParameterEditorAliasConverter.CreateMappingsForCoreEditors();

            //create database and service contexts for the app context
-            var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, LoggerResolver.Current.Logger);
+            var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, ProfilingLogger.Logger);
            Database.Mapper = new PetaPocoMapper();

            var dbContext = new DatabaseContext(
                dbFactory,
-                LoggerResolver.Current.Logger,
-                SqlSyntaxProviders.CreateDefault(LoggerResolver.Current.Logger));
+                ProfilingLogger.Logger,
+                SqlSyntaxProviders.CreateDefault(ProfilingLogger.Logger));

            //initialize the DatabaseContext
            dbContext.Initialize();
-            
-            var serviceContext = new ServiceContext(
-                new RepositoryFactory(ApplicationCache, LoggerResolver.Current.Logger, dbContext.SqlSyntax, UmbracoConfig.For.UmbracoSettings()), 
-                new PetaPocoUnitOfWorkProvider(dbFactory),
-                new FileUnitOfWorkProvider(),
-                new PublishingStrategy(),
-                ApplicationCache,
-                LoggerResolver.Current.Logger);

-            CreateApplicationContext(dbContext, serviceContext);
+            //get the service context
+            var serviceContext = CreateServiceContext(dbContext, dbFactory);
+
+            //set property and singleton from response
+            ApplicationContext.Current = ApplicationContext = CreateApplicationContext(dbContext, serviceContext);

            InitializeApplicationEventsResolver();

            InitializeResolvers();

-            
-
            InitializeModelMappers();

-            //now we need to call the initialize methods
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationInitialized(UmbracoApplication, ApplicationContext));
+            using (ProfilingLogger.DebugDuration<CoreBootManager>(
+                string.Format("Executing {0} IApplicationEventHandler.OnApplicationInitialized", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                "Finished executing IApplicationEventHandler.OnApplicationInitialized"))
+	        {
+                //now we need to call the initialize methods
+                ApplicationEventsResolver.Current.ApplicationEventHandlers
+                    .ForEach(x =>
+                    {
+                        try
+                        {
+                            using (ProfilingLogger.DebugDuration<CoreBootManager>(string.Format("Executing {0} in ApplicationInitialized", x.GetType())))
+                            {
+                                x.OnApplicationInitialized(UmbracoApplication, ApplicationContext);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationInitialized for handler " + x.GetType(), ex);
+                            throw;
+                        }
+                    });
+	        }

            _isInitialized = true;

@@ -129,28 +155,54 @@ namespace Umbraco.Core
        }

        /// <summary>
-        /// Creates and assigns the application context singleton
+        /// Creates and returns the service context for the app
        /// </summary>
        /// <param name="dbContext"></param>
-        /// <param name="serviceContext"></param>
-        protected virtual void CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
+        /// <param name="dbFactory"></param>
+        /// <returns></returns>
+        protected virtual ServiceContext CreateServiceContext(DatabaseContext dbContext, IDatabaseFactory dbFactory)
        {
-            //create the ApplicationContext
-            ApplicationContext = ApplicationContext.Current = new ApplicationContext(dbContext, serviceContext, ApplicationCache, _profilingLogger);
+            //default transient factory
+            var msgFactory = new TransientMessagesFactory();
+            return new ServiceContext(
+                new RepositoryFactory(ApplicationCache, ProfilingLogger.Logger, dbContext.SqlSyntax, UmbracoConfig.For.UmbracoSettings()),
+                new PetaPocoUnitOfWorkProvider(dbFactory),
+                new FileUnitOfWorkProvider(),
+                new PublishingStrategy(msgFactory, ProfilingLogger.Logger),
+                ApplicationCache,
+                ProfilingLogger.Logger,
+                msgFactory);
        }

        /// <summary>
-        /// Creates and assigns the ApplicationCache based on a new instance of System.Web.Caching.Cache
+        /// Creates and returns the application context for the app
        /// </summary>
-        protected virtual void CreateApplicationCache()
+        /// <param name="dbContext"></param>
+        /// <param name="serviceContext"></param>
+        protected virtual ApplicationContext CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
+        {
+            //create the ApplicationContext
+            return new ApplicationContext(dbContext, serviceContext, ApplicationCache, ProfilingLogger);
+        }
+
+        /// <summary>
+        /// Creates and returns the CacheHelper for the app
+        /// </summary>
+        protected virtual CacheHelper CreateApplicationCache()
        {
            var cacheHelper = new CacheHelper(
-                        new ObjectCacheRuntimeCacheProvider(),
-                        new StaticCacheProvider(),
+                //we need to have the dep clone runtime cache provider to ensure 
+                //all entities are cached properly (cloned in and cloned out)
+                new DeepCloneRuntimeCacheProvider(new ObjectCacheRuntimeCacheProvider()),
+                new StaticCacheProvider(),
                //we have no request based cache when not running in web-based context
-                        new NullCacheProvider());
+                new NullCacheProvider(),
+                new IsolatedRuntimeCache(type =>
+                    //we need to have the dep clone runtime cache provider to ensure 
+                    //all entities are cached properly (cloned in and cloned out)
+                    new DeepCloneRuntimeCacheProvider(new ObjectCacheRuntimeCacheProvider())));

-            ApplicationCache = cacheHelper;
+            return cacheHelper;
        }

        /// <summary>
@@ -176,7 +228,7 @@ namespace Umbraco.Core
        /// </summary>
        protected virtual void InitializeLoggerResolver()
        {
-            LoggerResolver.Current = new LoggerResolver(Logger.CreateWithDefaultLog4NetConfiguration())
+            LoggerResolver.Current = new LoggerResolver(ProfilingLogger == null ? Logger.CreateWithDefaultLog4NetConfiguration() : ProfilingLogger.Logger)
            {
                //This is another special resolver that needs to be resolvable before resolution is frozen
                //since it is used for profiling the application startup
@@ -190,7 +242,7 @@ namespace Umbraco.Core
        protected virtual void InitializeProfilerResolver()
        {
            //By default we'll initialize the Log profiler (in the web project, we'll override with the web profiler)
-            ProfilerResolver.Current = new ProfilerResolver(new LogProfiler(LoggerResolver.Current.Logger))
+            ProfilerResolver.Current = new ProfilerResolver(ProfilingLogger == null ? new LogProfiler(LoggerResolver.Current.Logger) : ProfilingLogger.Profiler)
            {
                //This is another special resolver that needs to be resolvable before resolution is frozen
                //since it is used for profiling the application startup
@@ -211,7 +263,7 @@ namespace Umbraco.Core
            //... and set the special flag to let us resolve before frozen resolution
            ApplicationEventsResolver.Current = new ApplicationEventsResolver(
                ServiceProvider, 
-                LoggerResolver.Current.Logger,
+                ProfilingLogger.Logger,
                PluginManager.ResolveApplicationStartupHandlers())
            {
                CanResolveBeforeFrozen = true
@@ -226,7 +278,7 @@ namespace Umbraco.Core
        /// <param name="rootPath">Absolute</param>
        protected virtual void InitializeApplicationRootPath(string rootPath)
        {
-            Umbraco.Core.IO.IOHelper.SetRootDirectory(rootPath);
+            IOHelper.SetRootDirectory(rootPath);
        }

        /// <summary>
@@ -240,11 +292,30 @@ namespace Umbraco.Core
            if (_isStarted)
                throw new InvalidOperationException("The boot manager has already been initialized");

-            //call OnApplicationStarting of each application events handler
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationStarting(UmbracoApplication, ApplicationContext));
+            using (ProfilingLogger.DebugDuration<CoreBootManager>(
+                string.Format("Executing {0} IApplicationEventHandler.OnApplicationStarting", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                "Finished executing IApplicationEventHandler.OnApplicationStarting"))
+		    {
+		        //call OnApplicationStarting of each application events handler
+		        ApplicationEventsResolver.Current.ApplicationEventHandlers
+		            .ForEach(x =>
+		            {
+		                try
+		                {
+		                    using (ProfilingLogger.DebugDuration<CoreBootManager>(string.Format("Executing {0} in ApplicationStarting", x.GetType())))
+		                    {
+		                        x.OnApplicationStarting(UmbracoApplication, ApplicationContext);
+		                    }
+		                }
+		                catch (Exception ex)
+		                {
+                            ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationStarting for handler " + x.GetType(), ex);
+		                    throw;
+		                }
+		            });
+		    }

-            if (afterStartup != null)
+		    if (afterStartup != null)
            {
                afterStartup(ApplicationContext.Current);
            }
@@ -263,12 +334,40 @@ namespace Umbraco.Core
        {
            if (_isComplete)
                throw new InvalidOperationException("The boot manager has already been completed");
-
+            
            FreezeResolution();

-            //call OnApplicationStarting of each application events handler
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationStarted(UmbracoApplication, ApplicationContext));
+            //Here we need to make sure the db can be connected to
+		    EnsureDatabaseConnection();
+
+
+            //This is a special case for the user service, we need to tell it if it's an upgrade, if so we need to ensure that
+            // exceptions are bubbled up if a user is attempted to be persisted during an upgrade (i.e. when they auth to login)
+            ((UserService) ApplicationContext.Services.UserService).IsUpgrading = true;
+
+
+            using (ProfilingLogger.DebugDuration<CoreBootManager>(
+                string.Format("Executing {0} IApplicationEventHandler.OnApplicationStarted", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                "Finished executing IApplicationEventHandler.OnApplicationStarted"))
+            {
+                //call OnApplicationStarting of each application events handler
+                ApplicationEventsResolver.Current.ApplicationEventHandlers
+                    .ForEach(x =>
+                    {
+                        try
+                        {
+                            using (ProfilingLogger.DebugDuration<CoreBootManager>(string.Format("Executing {0} in ApplicationStarted", x.GetType())))
+                            {
+                                x.OnApplicationStarted(UmbracoApplication, ApplicationContext);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationStarted for handler " + x.GetType(), ex);
+                            throw;
+                        }
+                    }); 
+            }

            //Now, startup all of our legacy startup handler
            ApplicationEventsResolver.Current.InstantiateLegacyStartupHandlers();
@@ -286,6 +385,36 @@ namespace Umbraco.Core
            //stop the timer and log the output
            _timer.Dispose();
            return this;
+		}
+
+        /// <summary>
+        /// We cannot continue if the db cannot be connected to
+        /// </summary>
+        private void EnsureDatabaseConnection()
+        {
+            if (ApplicationContext.IsConfigured == false) return;
+            if (ApplicationContext.DatabaseContext.IsDatabaseConfigured == false) return;
+
+            //try now
+            if (ApplicationContext.DatabaseContext.CanConnect)
+                return;
+
+            var currentTry = 0;
+            while (currentTry < 5)
+            {
+                //first wait, then retry
+                Thread.Sleep(1000);
+
+                if (ApplicationContext.DatabaseContext.CanConnect)
+                    break;
+
+                currentTry++;
+            }
+
+            if (currentTry == 5)
+            {
+                throw new UmbracoStartupFailedException("Umbraco cannot start. A connection string is configured but the Umbraco cannot connect to the database.");
+            }
        }

        /// <summary>
@@ -305,12 +434,12 @@ namespace Umbraco.Core
                ApplicationCache.RuntimeCache,
                new ManifestParser(new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), ApplicationCache.RuntimeCache));

-            PropertyEditorResolver.Current = new PropertyEditorResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolvePropertyEditors(), builder);
-            ParameterEditorResolver.Current = new ParameterEditorResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolveParameterEditors(), builder);
+            PropertyEditorResolver.Current = new PropertyEditorResolver(ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolvePropertyEditors(), builder);
+            ParameterEditorResolver.Current = new ParameterEditorResolver(ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolveParameterEditors(), builder);

            //setup the validators resolver with our predefined validators
            ValidatorsResolver.Current = new ValidatorsResolver(
-                ServiceProvider, LoggerResolver.Current.Logger, new[]
+                ServiceProvider, ProfilingLogger.Logger, new[]
                {
                    new Lazy<Type>(() => typeof (RequiredManifestValueValidator)),
                    new Lazy<Type>(() => typeof (RegexValidator)),
@@ -319,67 +448,76 @@ namespace Umbraco.Core
                    new Lazy<Type>(() => typeof (IntegerValidator)),
                });

-            //by default we'll use the standard configuration based sync
-            ServerRegistrarResolver.Current = new ServerRegistrarResolver(
-                new ConfigServerRegistrar());
+            //by default we'll use the db server registrar unless the developer has the legacy
+            // dist calls enabled, in which case we'll use the config server registrar
+            if (UmbracoConfig.For.UmbracoSettings().DistributedCall.Enabled)
+            {
+                ServerRegistrarResolver.Current = new ServerRegistrarResolver(new ConfigServerRegistrar());
+            }
+            else
+            {
+                ServerRegistrarResolver.Current = new ServerRegistrarResolver(
+                    new DatabaseServerRegistrar(
+                        new Lazy<IServerRegistrationService>(() => ApplicationContext.Services.ServerRegistrationService),
+                        new DatabaseServerRegistrarOptions()));
+            }
+            

-            //by default (outside of the web) we'll use the default server messenger without
-            //supplying a username/password, this will automatically disable distributed calls
-            // .. we'll override this in the WebBootManager
+            //by default we'll use the database server messenger with default options (no callbacks),
+            // this will be overridden in the web startup
            ServerMessengerResolver.Current = new ServerMessengerResolver(
-                new WebServiceServerMessenger());
+                new DatabaseServerMessenger(ApplicationContext, true, new DatabaseServerMessengerOptions()));

            MappingResolver.Current = new MappingResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                () => PluginManager.ResolveAssignedMapperTypes());

           
-
            //RepositoryResolver.Current = new RepositoryResolver(
            //    new RepositoryFactory(ApplicationCache));

            CacheRefreshersResolver.Current = new CacheRefreshersResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                () => PluginManager.ResolveCacheRefreshers());

            DataTypesResolver.Current = new DataTypesResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                () => PluginManager.ResolveDataTypes());

            MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                () => PluginManager.ResolveMacroRenderings());

            PackageActionsResolver.Current = new PackageActionsResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                () => PluginManager.ResolvePackageActions());

            ActionsResolver.Current = new ActionsResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                () => PluginManager.ResolveActions());

            //the database migration objects
            MigrationResolver.Current = new MigrationResolver(
-                LoggerResolver.Current.Logger,
+                ProfilingLogger.Logger,
                () => PluginManager.ResolveTypes<IMigration>());

            // todo: remove once we drop IPropertyEditorValueConverter support.
            PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                PluginManager.ResolvePropertyEditorValueConverters());

            // need to filter out the ones we dont want!!
            PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                PluginManager.ResolveTypes<IPropertyValueConverter>());

            // use the new DefaultShortStringHelper
            ShortStringHelperResolver.Current = new ShortStringHelperResolver(
                //new LegacyShortStringHelper());
-                new DefaultShortStringHelper().WithDefaultConfig());
+                new DefaultShortStringHelper(UmbracoConfig.For.UmbracoSettings()).WithDefaultConfig());

            UrlSegmentProviderResolver.Current = new UrlSegmentProviderResolver(
-                ServiceProvider, LoggerResolver.Current.Logger,
+                ServiceProvider, ProfilingLogger.Logger,
                typeof(DefaultUrlSegmentProvider));

            // by default, no factory is activated
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Configuration;
 using System.Xml.Linq;
+using Semver;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
@@ -13,6 +14,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Persistence.Migrations.Initial;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;

 namespace Umbraco.Core
 {
@@ -28,8 +30,6 @@ namespace Umbraco.Core
        private readonly ILogger _logger;
        private readonly SqlSyntaxProviders _syntaxProviders;
        private bool _configured;
-        private bool _canConnect;
-        private volatile bool _connectCheck = false;
        private readonly object _locker = new object();
        private string _connectionString;
        private string _providerName;
@@ -90,7 +90,7 @@ namespace Umbraco.Core
        /// This should not be used for CRUD operations or queries against the
        /// standard Umbraco tables! Use the Public services for that.
        /// </remarks>
-        public UmbracoDatabase Database
+        public virtual UmbracoDatabase Database
        {
            get { return _factory.CreateDatabase(); }
        }
@@ -98,7 +98,7 @@ namespace Umbraco.Core
        /// <summary>
        /// Boolean indicating whether the database has been configured
        /// </summary>
-        public bool IsDatabaseConfigured
+        public virtual bool IsDatabaseConfigured
        {
            get { return _configured; }
        }
@@ -106,33 +106,21 @@ namespace Umbraco.Core
        /// <summary>
        /// Determines if the db can be connected to
        /// </summary>
-        public bool CanConnect
+        public virtual bool CanConnect
        {
            get
            {
                if (IsDatabaseConfigured == false) return false;
-
-                //double check lock so that it is only checked once and is fast
-                if (_connectCheck == false)
-                {
-                    lock (_locker)
-                    {
-                        if (_canConnect == false)
-                        {
-                            _canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
-                            _connectCheck = true;
-                        }
-                    }
-                }
-
-                return _canConnect;
+                var canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
+                LogHelper.Info<DatabaseContext>("CanConnect = " + canConnect);
+                return canConnect;
            }
        }

        /// <summary>
        /// Gets the configured umbraco db connection string.
        /// </summary>
-        public string ConnectionString
+        public virtual string ConnectionString
        {
            get { return _connectionString; }
        }
@@ -150,7 +138,7 @@ namespace Umbraco.Core
                _providerName = "System.Data.SqlClient";
                if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
                {
-                    if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
+                    if (string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName) == false)
                        _providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
                }
                else
@@ -164,7 +152,7 @@ namespace Umbraco.Core
        /// <summary>
        /// Returns the Type of DatabaseProvider used
        /// </summary>
-        public DatabaseProviders DatabaseProvider
+        public virtual DatabaseProviders DatabaseProvider
        {
            get
            {
@@ -541,7 +529,7 @@ namespace Umbraco.Core
            return _result;
        }

-        internal Result CreateDatabaseSchemaAndData()
+        internal Result CreateDatabaseSchemaAndData(ApplicationContext applicationContext)
        {   
            try
            {
@@ -578,12 +566,15 @@ namespace Umbraco.Core
                message = GetResultMessageForMySql();

                var schemaResult = ValidateDatabaseSchema();
-                var installedVersion = schemaResult.DetermineInstalledVersion();
+                
+                var installedSchemaVersion = schemaResult.DetermineInstalledVersion();
                
                //If Configuration Status is empty and the determined version is "empty" its a new install - otherwise upgrade the existing
-                if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedVersion.Equals(new Version(0, 0, 0)))
+                if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedSchemaVersion.Equals(new Version(0, 0, 0)))
                {
-                    database.CreateDatabaseSchema();
+                    var helper = new DatabaseSchemaHelper(database, _logger, SqlSyntax);
+                    helper.CreateDatabaseSchema(true, applicationContext);
+
                    message = message + "<p>Installation completed!</p>";

                    //now that everything is done, we need to determine the version of SQL server that is executing
@@ -612,7 +603,7 @@ namespace Umbraco.Core
        /// This assumes all of the previous checks are done!
        /// </summary>
        /// <returns></returns>
-        internal Result UpgradeSchemaAndData()
+        internal Result UpgradeSchemaAndData(IMigrationEntryService migrationEntryService)
        {
            try
            {
@@ -631,16 +622,56 @@ namespace Umbraco.Core
                var message = GetResultMessageForMySql();

                var schemaResult = ValidateDatabaseSchema();
-                var installedVersion = schemaResult.DetermineInstalledVersion();
+
+                var installedSchemaVersion = new SemVersion(schemaResult.DetermineInstalledVersion());
+
+                var installedMigrationVersion = new SemVersion(0);
+                //we cannot check the migrations table if it doesn't exist, this will occur when upgrading to 7.3
+                if (schemaResult.ValidTables.Any(x => x.InvariantEquals("umbracoMigration")))
+                {
+                    installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);    
+                }
+
+                var targetVersion = UmbracoVersion.Current;
                
+                //In some cases - like upgrading from 7.2.6 -> 7.3, there will be no migration information in the database and therefore it will
+                // return a version of 0.0.0 and we don't necessarily want to run all migrations from 0 -> 7.3, so we'll just ensure that the 
+                // migrations are run for the target version
+                if (installedMigrationVersion == new SemVersion(new Version(0, 0, 0)) && installedSchemaVersion > new SemVersion(new Version(0, 0, 0)))
+                {
+                    //set the installedMigrationVersion to be one less than the target so the latest migrations are guaranteed to execute
+                    installedMigrationVersion = new SemVersion(targetVersion.SubtractRevision());
+                }
+                
+                //Figure out what our current installed version is. If the web.config doesn't have a version listed, then we'll use the minimum
+                // version detected between the schema installed and the migrations listed in the migration table. 
+                // If there is a version in the web.config, we'll take the minimum between the listed migration in the db and what
+                // is declared in the web.config.
+                
+                var currentInstalledVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
+                    //Take the minimum version between the detected schema version and the installed migration version
+                    ? new[] {installedSchemaVersion, installedMigrationVersion}.Min()
+                    //Take the minimum version between the installed migration version and the version specified in the config
+                    : new[] { SemVersion.Parse(GlobalSettings.ConfigurationStatus), installedMigrationVersion }.Min();
+
+                //Ok, another edge case here. If the current version is a pre-release, 
+                // then we want to ensure all migrations for the current release are executed. 
+                if (currentInstalledVersion.Prerelease.IsNullOrWhiteSpace() == false)
+                {
+                    currentInstalledVersion  = new SemVersion(currentInstalledVersion.GetVersion().SubtractRevision());
+                }
+
                //DO the upgrade!

-                var currentVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
-                                                ? installedVersion
-                                                : new Version(GlobalSettings.ConfigurationStatus);
-                var targetVersion = UmbracoVersion.Current;
-                var runner = new MigrationRunner(_logger, currentVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
+                var runner = new MigrationRunner(migrationEntryService, _logger, currentInstalledVersion, UmbracoVersion.GetSemanticVersion(), GlobalSettings.UmbracoMigrationName);
+
                var upgraded = runner.Execute(database, true);
+
+                if (upgraded == false)
+                {
+                    throw new ApplicationException("Upgrading failed, either an error occurred during the upgrade process or an event canceled the upgrade process, see log for full details");
+                }
+
                message = message + "<p>Upgrade completed!</p>";

                //now that everything is done, we need to determine the version of SQL server that is executing
@@ -0,0 +1,44 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+namespace Umbraco.Core
+{
+    public static class DelegateExtensions
+    {
+        public static Attempt<T> RetryUntilSuccessOrTimeout<T>(this Func<Attempt<T>> task, TimeSpan timeout, TimeSpan pause)
+        {
+            if (pause.TotalMilliseconds < 0)
+            {
+                throw new ArgumentException("pause must be >= 0 milliseconds");
+            }
+            var stopwatch = Stopwatch.StartNew();
+            do
+            {
+                var result = task();
+                if (result) { return result; }
+                Thread.Sleep((int)pause.TotalMilliseconds);
+            }
+            while (stopwatch.Elapsed < timeout);
+            return Attempt<T>.Fail();
+        }
+
+        public static Attempt<T> RetryUntilSuccessOrMaxAttempts<T>(this Func<int, Attempt<T>> task, int totalAttempts, TimeSpan pause)
+        {
+            if (pause.TotalMilliseconds < 0)
+            {
+                throw new ArgumentException("pause must be >= 0 milliseconds");
+            }
+            int attempts = 0;
+            do
+            {
+                attempts++;
+                var result = task(attempts);
+                if (result) { return result; }
+                Thread.Sleep((int)pause.TotalMilliseconds);
+            }
+            while (attempts < totalAttempts);
+            return Attempt<T>.Fail();
+        }
+    }
+}
@@ -4,69 +4,58 @@ using System.Threading;
 namespace Umbraco.Core
 {
 	/// <summary>
-	/// Abstract implementation of logic commonly required to safely handle disposable unmanaged resources.
+	/// Abstract implementation of IDisposable.
 	/// </summary>
+	/// <remarks>
+	/// Can also be used as a pattern for when inheriting is not possible.
+	/// 
+    /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
+    /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
+    /// 
+    /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
+    /// has allocated disposable objects, it should take care of disposing them.
+	/// </remarks>
 	public abstract class DisposableObject : IDisposable
 	{
 		private bool _disposed;
-		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+	    private readonly object _locko = new object();

-		/// <summary>
-		/// Gets a value indicating whether this instance is disposed.
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> if this instance is disposed; otherwise, <c>false</c>.
-		/// </value>
-		public bool IsDisposed
-		{
-			get { return _disposed; }
-		}
+		// gets a value indicating whether this instance is disposed.
+        // for internal tests only (not thread safe)
+        //TODO make this internal + rename "Disposed" when we can break compatibility
+		public bool IsDisposed { get { return _disposed; } }

-		/// <summary>
-		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-		/// </summary>
-		/// <filterpriority>2</filterpriority>
+		// implements IDisposable
 		public void Dispose()
 		{
 			Dispose(true);
-
-			// Use SupressFinalize in case a subclass of this type implements a finalizer.
 			GC.SuppressFinalize(this);
 		}

+        // finalizer
 		~DisposableObject()
 		{
-			// Run dispose but let the class know it was due to the finalizer running.
 			Dispose(false);
 		}

-		protected virtual void Dispose(bool disposing)
+        //TODO make this private, non-virtual when we can break compatibility
+        protected virtual void Dispose(bool disposing)
 		{
-			// Only operate if we haven't already disposed
-			if (IsDisposed || !disposing) return;
+		    lock (_locko)
+		    {
+		        if (_disposed) return;
+		        _disposed = true;
+		    }

-			using (new WriteLock(_disposalLocker))
-			{
-				// Check again now we're inside the lock
-				if (IsDisposed) return;
+            DisposeUnmanagedResources();

-				// Call to actually release resources. This method is only
-				// kept separate so that the entire disposal logic can be used as a VS snippet
-				DisposeResources();
-
-				// Indicate that the instance has been disposed.
-				_disposed = true;
-			}
+            if (disposing)
+                DisposeResources();
 		}

-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
 		protected abstract void DisposeResources();

 		protected virtual void DisposeUnmanagedResources()
-		{
-
-		}
+		{ }
 	}
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Web;
@@ -12,6 +13,12 @@ namespace Umbraco.Core
 	/// </summary>
 	public class DisposableTimer : DisposableObject
 	{
+	    private readonly ILogger _logger;
+	    private readonly LogType? _logType;
+	    private readonly IProfiler _profiler;
+	    private readonly Type _loggerType;
+	    private readonly string _endMessage;
+	    private readonly IDisposable _profilerStep;
 	    private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
 		private readonly Action<long> _callback;

@@ -25,25 +32,12 @@ namespace Umbraco.Core
            if (logger == null) throw new ArgumentNullException("logger");
            if (loggerType == null) throw new ArgumentNullException("loggerType");

-            _callback = x =>
-            {
-                if (profiler != null)
-                {
-                    profiler.DisposeIfDisposable();
-                }
-                switch (logType)
-                {
-                    case LogType.Debug:
-                        logger.Debug(loggerType, () => endMessage + " (took " + x + "ms)");
-                        break;
-                    case LogType.Info:
-                        logger.Info(loggerType, () => endMessage + " (took " + x + "ms)");
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException("logType");
-                }
-                
-            };
+            _logger = logger;
+            _logType = logType;
+            _profiler = profiler;
+            _loggerType = loggerType;
+            _endMessage = endMessage;
+            
            switch (logType)
            {
                case LogType.Debug:
@@ -58,7 +52,7 @@ namespace Umbraco.Core
            
            if (profiler != null)
            {
-                profiler.Step(loggerType, startMessage);    
+                _profilerStep = profiler.Step(loggerType, startMessage);
            }
        }

@@ -223,7 +217,36 @@ namespace Umbraco.Core
 		/// </summary>
 		protected override void DisposeResources()
 		{
-			_callback.Invoke(Stopwatch.ElapsedMilliseconds);
+            if (_profiler != null)
+            {
+                _profiler.DisposeIfDisposable();
+            }
+
+		    if (_profilerStep != null)
+		    {
+                _profilerStep.Dispose();
+            }
+
+		    if (_logType.HasValue && _endMessage.IsNullOrWhiteSpace() == false && _loggerType != null && _logger != null)
+		    {
+                switch (_logType)
+                {
+                    case LogType.Debug:
+                        _logger.Debug(_loggerType, () => _endMessage + " (took " + Stopwatch.ElapsedMilliseconds + "ms)");
+                        break;
+                    case LogType.Info:
+                        _logger.Info(_loggerType, () => _endMessage + " (took " + Stopwatch.ElapsedMilliseconds + "ms)");
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException("logType");
+                }
+            }
+
+		    if (_callback != null)
+		    {
+                _callback.Invoke(Stopwatch.ElapsedMilliseconds);
+            }
+            
 		}

 	}
@@ -101,6 +101,7 @@ namespace Umbraco.Core
        /// <param name="f">The select child.</param>
        /// <typeparam name="T">Item type</typeparam>
        /// <returns>list of TItem</returns>
+        [Obsolete("Do not use, use SelectRecursive instead which has far less potential of re-iterating an iterator which may cause significantly more SQL queries")]
        public static IEnumerable<T> FlattenList<T>(this IEnumerable<T> e, Func<T, IEnumerable<T>> f)
        {
            return e.SelectMany(c => f(c).FlattenList(f)).Concat(e);
@@ -3,7 +3,7 @@ using System.Security.Permissions;

 namespace Umbraco.Core.Events
 {
-	/// <summary>
+    /// <summary>
 	/// Event args for that can support cancellation
 	/// </summary>
 	[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
@@ -11,15 +11,30 @@ namespace Umbraco.Core.Events
 	{
 		private bool _cancel;

-		public CancellableEventArgs(bool canCancel)
+        public CancellableEventArgs(bool canCancel, EventMessages eventMessages)
+        {
+            if (eventMessages == null) throw new ArgumentNullException("eventMessages");
+            CanCancel = canCancel;
+            Messages = eventMessages;
+        }
+
+        public CancellableEventArgs(bool canCancel)
 		{
 			CanCancel = canCancel;
-		}
+            //create a standalone messages
+            Messages = new EventMessages();
+        }

-		public CancellableEventArgs()
+        public CancellableEventArgs(EventMessages eventMessages)
+            : this(true, eventMessages)
+        {
+        }
+
+        public CancellableEventArgs()
 			: this(true)
 		{
 		}
+
 		/// <summary>
 		/// Flag to determine if this instance will support being cancellable
 		/// </summary>
@@ -32,7 +47,7 @@ namespace Umbraco.Core.Events
 		{
 			get
 			{
-				if (!CanCancel)
+				if (CanCancel == false)
 				{
 					throw new InvalidOperationException("This event argument class does not support cancelling.");
 				}
@@ -40,12 +55,28 @@ namespace Umbraco.Core.Events
 			}
 			set
 			{
-				if (!CanCancel)
+				if (CanCancel == false)
 				{
 					throw new InvalidOperationException("This event argument class does not support cancelling.");
 				}
 				_cancel = value;
 			}
 		}
-	}
+
+        /// <summary>
+        /// if this instance supports cancellation, this will set Cancel to true with an affiliated cancellation message
+        /// </summary>
+        /// <param name="cancelationMessage"></param>
+        public void CancelOperation(EventMessage cancelationMessage)
+        {
+            Cancel = true;
+            cancelationMessage.IsDefaultEventMessage = true;
+            Messages.Add(cancelationMessage);
+        }
+
+        /// <summary>
+        /// Returns the EventMessages object which is used to add messages to the message collection for this event
+        /// </summary>
+        public EventMessages Messages { get; private set; }
+    }
 }
@@ -12,7 +12,18 @@ namespace Umbraco.Core.Events
 	public class CancellableObjectEventArgs<T> : CancellableEventArgs
 	{

-		public CancellableObjectEventArgs(T eventObject, bool canCancel)
+        public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages eventMessages)
+            : base(canCancel, eventMessages)
+        {
+            EventObject = eventObject;
+        }
+
+        public CancellableObjectEventArgs(T eventObject, EventMessages eventMessages)
+            : this(eventObject, true, eventMessages)
+        {
+        }
+
+        public CancellableObjectEventArgs(T eventObject, bool canCancel)
 			: base(canCancel)
 		{
 			EventObject = eventObject;
@@ -4,12 +4,56 @@ namespace Umbraco.Core.Events
 {
 	public class DeleteEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
 	{
-		/// <summary>
-		/// Constructor accepting multiple entities that are used in the delete operation
-		/// </summary>
-		/// <param name="eventObject"></param>
-		/// <param name="canCancel"></param>
-		public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel) : base(eventObject, canCancel)
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the delete operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, EventMessages eventMessages) : base(eventObject, canCancel, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the delete operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(IEnumerable<TEntity> eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(TEntity eventObject, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the delete operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel) : base(eventObject, canCancel)
 		{
            MediaFilesToDelete = new List<string>();
 		}
@@ -60,7 +104,13 @@ namespace Umbraco.Core.Events

 	public class DeleteEventArgs : CancellableEventArgs
 	{
-		public DeleteEventArgs(int id, bool canCancel)
+        public DeleteEventArgs(int id, bool canCancel, EventMessages eventMessages)
+            : base(canCancel, eventMessages)
+        {
+            Id = id;
+        }
+
+        public DeleteEventArgs(int id, bool canCancel)
 			: base(canCancel)
 		{
 			Id = id;
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;

 namespace Umbraco.Core.Events
 {
@@ -7,16 +8,16 @@ namespace Umbraco.Core.Events
 	/// </summary>
 	public static class EventExtensions
 	{
-		/// <summary>
-		/// Raises the event and returns a boolean value indicating if the event was cancelled
-		/// </summary>
-		/// <typeparam name="TSender"></typeparam>
-		/// <typeparam name="TArgs"></typeparam>
-		/// <param name="eventHandler"></param>
-		/// <param name="args"></param>
-		/// <param name="sender"></param>
-		/// <returns></returns>
-		public static bool IsRaisedEventCancelled<TSender, TArgs>(
+        /// <summary>
+        /// Raises the event and returns a boolean value indicating if the event was cancelled
+        /// </summary>
+        /// <typeparam name="TSender"></typeparam>
+        /// <typeparam name="TArgs"></typeparam>
+        /// <param name="eventHandler"></param>
+        /// <param name="args"></param>
+        /// <param name="sender"></param>
+        /// <returns></returns>
+        public static bool IsRaisedEventCancelled<TSender, TArgs>(
 			this TypedEventHandler<TSender, TArgs> eventHandler,
 			TArgs args,
 			TSender sender)
@@ -27,16 +28,16 @@ namespace Umbraco.Core.Events

 			return args.Cancel;
 		}
-
-		/// <summary>
-		/// Raises the event
-		/// </summary>
-		/// <typeparam name="TSender"></typeparam>
-		/// <typeparam name="TArgs"></typeparam>
-		/// <param name="eventHandler"></param>
-		/// <param name="args"></param>
-		/// <param name="sender"></param>
-		public static void RaiseEvent<TSender, TArgs>(
+        
+        /// <summary>
+        /// Raises the event
+        /// </summary>
+        /// <typeparam name="TSender"></typeparam>
+        /// <typeparam name="TArgs"></typeparam>
+        /// <param name="eventHandler"></param>
+        /// <param name="args"></param>
+        /// <param name="sender"></param>
+        public static void RaiseEvent<TSender, TArgs>(
 			this TypedEventHandler<TSender, TArgs> eventHandler,
 			TArgs args,
 			TSender sender)
@@ -0,0 +1,27 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// An event message
+    /// </summary>
+    public sealed class EventMessage
+    {        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventMessage"/> class.
+        /// </summary>
+        public EventMessage(string category, string message, EventMessageType messageType = EventMessageType.Default)
+        {
+            Category = category;
+            Message = message;
+            MessageType = messageType;
+        }
+
+        public string Category { get; private set; }
+        public string Message { get; private set; }
+        public EventMessageType MessageType { get; private set; }
+
+        /// <summary>
+        /// This is used to track if this message should be used as a default message so that Umbraco doesn't also append it's own default messages
+        /// </summary>
+        internal bool IsDefaultEventMessage { get; set; }
+    }
+}
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Event messages collection
+    /// </summary>
+    public sealed class EventMessages : DisposableObject
+    {
+        private readonly List<EventMessage> _msgs = new List<EventMessage>();
+
+        public void Add(EventMessage msg)
+        {
+            _msgs.Add(msg);
+        }
+
+        public int Count
+        {
+            get { return _msgs.Count; }
+        }
+
+        public IEnumerable<EventMessage> GetAll()
+        {
+            return _msgs;
+        }
+
+        protected override void DisposeResources()
+        {
+            _msgs.Clear();
+        }
+    }
+}
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Event messages factory
+    /// </summary>
+    public interface IEventMessagesFactory
+    {
+        EventMessages Get();
+    }
+}
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// The type of event message
+    /// </summary>
+    public enum EventMessageType
+    {
+        Default = 0,
+        Info = 1,
+        Error = 2,
+        Success = 3,        
+        Warning = 4
+    }
+}
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using Semver;
 using Umbraco.Core.Persistence.Migrations;

 namespace Umbraco.Core.Events
@@ -13,11 +15,20 @@ namespace Umbraco.Core.Events
        /// <param name="targetVersion"></param>
        /// <param name="canCancel"></param>
        /// <param name="configuredVersion"></param>
+        public MigrationEventArgs(IList<IMigration> eventObject, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
+            : base(eventObject, canCancel)
+        {
+            ConfiguredSemVersion = configuredVersion;
+            TargetSemVersion = targetVersion;
+        }
+
+        [Obsolete("Use constructor accepting UmbracoVersion instances instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public MigrationEventArgs(IList<IMigration> eventObject, Version configuredVersion, Version targetVersion, bool canCancel)
 			: base(eventObject, canCancel)
         {
-             ConfiguredVersion = configuredVersion;
-             TargetVersion = targetVersion;
+             ConfiguredSemVersion = new SemVersion(configuredVersion);
+             TargetSemVersion = new SemVersion(targetVersion);
         }

        /// <summary>
@@ -28,12 +39,12 @@ namespace Umbraco.Core.Events
        /// <param name="targetVersion"></param>
        /// <param name="canCancel"></param>
        /// <param name="configuredVersion"></param>
-        internal MigrationEventArgs(IList<IMigration> eventObject, MigrationContext migrationContext, Version configuredVersion, Version targetVersion, bool canCancel)
+        internal MigrationEventArgs(IList<IMigration> eventObject, MigrationContext migrationContext, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
            : base(eventObject, canCancel)
        {
            MigrationContext = migrationContext;
-            ConfiguredVersion = configuredVersion;
-            TargetVersion = targetVersion;
+            ConfiguredSemVersion = configuredVersion;
+            TargetSemVersion = targetVersion;
        }

        /// <summary>
@@ -42,11 +53,20 @@ namespace Umbraco.Core.Events
        /// <param name="eventObject"></param>
        /// <param name="configuredVersion"></param>
        /// <param name="targetVersion"></param>
+        public MigrationEventArgs(IList<IMigration> eventObject, SemVersion configuredVersion, SemVersion targetVersion)
+            : base(eventObject)
+        {
+            ConfiguredSemVersion = configuredVersion;
+            TargetSemVersion = targetVersion;
+        }
+
+        [Obsolete("Use constructor accepting UmbracoVersion instances instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public MigrationEventArgs(IList<IMigration> eventObject, Version configuredVersion, Version targetVersion)
 			: base(eventObject)
 		{
-            ConfiguredVersion = configuredVersion;
-            TargetVersion = targetVersion;
+            ConfiguredSemVersion = new SemVersion(configuredVersion);
+            TargetSemVersion = new SemVersion(targetVersion);
 		}

 		/// <summary>
@@ -57,9 +77,23 @@ namespace Umbraco.Core.Events
 			get { return EventObject; }
 		}

-        public Version ConfiguredVersion { get; private set; }
+        [Obsolete("Use ConfiguredSemVersion instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Version ConfiguredVersion
+        {
+            get { return ConfiguredSemVersion.GetVersion(); }
+        }

-        public Version TargetVersion { get; private set; }
+        [Obsolete("Use TargetUmbracoVersion instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Version TargetVersion
+        {
+            get { return TargetSemVersion.GetVersion(); }
+        }
+
+        public SemVersion ConfiguredSemVersion { get; private set; }
+
+        public SemVersion TargetSemVersion { get; private set; }

        internal MigrationContext MigrationContext { get; private set; }
    }
@@ -4,22 +4,51 @@ using System.Linq;

 namespace Umbraco.Core.Events
 {
-    public class MoveEventInfo<TEntity>
-    {
-        public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
-        {
-            Entity = entity;
-            OriginalPath = originalPath;
-            NewParentId = newParentId;
-        }
-
-        public TEntity Entity { get; set; }
-        public string OriginalPath { get; set; }
-        public int NewParentId { get; set; }
-    }
-
    public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
    {
+        /// <summary>
+        /// Constructor accepting a collection of MoveEventInfo objects
+        /// </summary>
+        /// <param name="canCancel"></param>
+        /// <param name="eventMessages"></param>
+        /// <param name="moveInfo">
+        /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+        /// </param>
+        public MoveEventArgs(bool canCancel, EventMessages eventMessages, params MoveEventInfo<TEntity>[] moveInfo)
+            : base(default(TEntity), canCancel, eventMessages)
+        {
+            if (moveInfo.FirstOrDefault() == null)
+            {
+                throw new ArgumentException("moveInfo argument must contain at least one item");
+            }
+
+            MoveInfoCollection = moveInfo;
+            //assign the legacy props
+            EventObject = moveInfo.First().Entity;
+            ParentId = moveInfo.First().NewParentId;
+        }
+
+        /// <summary>
+        /// Constructor accepting a collection of MoveEventInfo objects
+        /// </summary>
+        /// <param name="eventMessages"></param>
+        /// <param name="moveInfo">
+        /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+        /// </param>
+        public MoveEventArgs(EventMessages eventMessages, params MoveEventInfo<TEntity>[] moveInfo)
+            : base(default(TEntity), eventMessages)
+        {
+            if (moveInfo.FirstOrDefault() == null)
+            {
+                throw new ArgumentException("moveInfo argument must contain at least one item");
+            }
+
+            MoveInfoCollection = moveInfo;
+            //assign the legacy props
+            EventObject = moveInfo.First().Entity;
+            ParentId = moveInfo.First().NewParentId;
+        }
+
        /// <summary>
        /// Constructor accepting a collection of MoveEventInfo objects
        /// </summary>
@@ -0,0 +1,16 @@
+namespace Umbraco.Core.Events
+{
+    public class MoveEventInfo<TEntity>
+    {
+        public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
+        {
+            Entity = entity;
+            OriginalPath = originalPath;
+            NewParentId = newParentId;
+        }
+
+        public TEntity Entity { get; set; }
+        public string OriginalPath { get; set; }
+        public int NewParentId { get; set; }
+    }
+}
@@ -4,7 +4,39 @@ namespace Umbraco.Core.Events
 {
 	public class NewEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
 	{
-		public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId) : base(eventObject, canCancel)
+
+
+        public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+            Alias = alias;
+            ParentId = parentId;
+        }
+
+        public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, TEntity parent, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+            Alias = alias;
+            Parent = parent;
+        }
+
+        public NewEventArgs(TEntity eventObject, string @alias, int parentId, EventMessages eventMessages) 
+            : base(eventObject, eventMessages)
+        {
+            Alias = alias;
+            ParentId = parentId;
+        }
+
+        public NewEventArgs(TEntity eventObject, string @alias, TEntity parent, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+            Alias = alias;
+            Parent = parent;
+        }
+
+
+
+        public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId) : base(eventObject, canCancel)
 		{
 			Alias = alias;
 			ParentId = parentId;
@@ -4,6 +4,52 @@ namespace Umbraco.Core.Events
 {
    public class PublishEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
    {
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the publish operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        /// <param name="isAllPublished"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+            IsAllRepublished = isAllPublished;
+        }
+
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the publish operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(IEnumerable<TEntity> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+        /// <summary>
+        /// Constructor accepting a single entity instance
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(TEntity eventObject, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, eventMessages)
+        {
+        }
+
+        /// <summary>
+        /// Constructor accepting a single entity instance
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        /// <param name="isAllPublished"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(TEntity eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
+        {
+            IsAllRepublished = isAllPublished;
+        }
+
        /// <summary>
        /// Constructor accepting multiple entities that are used in the publish operation
        /// </summary>
@@ -4,12 +4,55 @@ namespace Umbraco.Core.Events
 {
 	public class SaveEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
 	{
-		/// <summary>
-		/// Constructor accepting multiple entities that are used in the saving operation
-		/// </summary>
-		/// <param name="eventObject"></param>
-		/// <param name="canCancel"></param>
-		public SaveEventArgs(IEnumerable<TEntity> eventObject, bool canCancel)
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the saving operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+        }
+
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the saving operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(IEnumerable<TEntity> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(TEntity eventObject, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, eventMessages)
+        {
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
+        {
+        }
+
+
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the saving operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        public SaveEventArgs(IEnumerable<TEntity> eventObject, bool canCancel)
 			: base(eventObject, canCancel)
 		{
 		}
@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// A simple/default transient messages factory
+    /// </summary>
+    internal class TransientMessagesFactory : IEventMessagesFactory
+    {
+        public EventMessages Get()
+        {
+            return new EventMessages();
+        }
+    }
+}
@@ -0,0 +1,18 @@
+using System;
+
+namespace Umbraco.Core.Exceptions
+{
+    /// <summary>
+    /// An exception that is thrown if the umbraco application cannnot boot
+    /// </summary>
+    public class UmbracoStartupFailedException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:System.Exception"/> class with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error. </param>
+        public UmbracoStartupFailedException(string message) : base(message)
+        {
+        }
+    }
+}
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
-
-<!-- Blocks public downloading of anything in this folder and sub folders -->
-
-<configuration> 
-  <system.web>
-    <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
-    </httpHandlers>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>
+<?xml version="1.0"?>
+
+<!-- Blocks public downloading of anything in this folder and sub folders -->
+
+<configuration> 
+  <system.web>
+    <httpHandlers>
+      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
+    </httpHandlers>
+  </system.web>
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+    </handlers>
+  </system.webServer>
+</configuration>
@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.0
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Umbraco.Core.FileResources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Files {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Files() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Core.FileResources.Files", typeof(Files).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot;?&gt;
+        ///
+        ///&lt;!-- Blocks public downloading of anything in this folder and sub folders --&gt;
+        ///
+        ///&lt;configuration&gt; 
+        ///  &lt;system.web&gt;
+        ///    &lt;httpHandlers&gt;
+        ///      &lt;add path=&quot;*&quot; verb=&quot;*&quot; type=&quot;System.Web.HttpNotFoundHandler&quot;/&gt;
+        ///    &lt;/httpHandlers&gt;
+        ///  &lt;/system.web&gt;
+        ///  &lt;system.webServer&gt;
+        ///    &lt;validation validateIntegratedModeConfiguration=&quot;false&quot; /&gt;
+        ///    &lt;handlers&gt;
+        ///      &lt;remove name=&quot;BlockViewHandler&quot;/&gt;
+        ///      &lt;add name=&quot;BlockViewHandler&quot; path=&quot;*&quot; verb=&quot;*&quot; preCondition=&quot;integratedMode&quot; type=&quot;System.Web.H [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string BlockingWebConfig {
+            get {
+                return ResourceManager.GetString("BlockingWebConfig", resourceCulture);
+            }
+        }
+    }
+}
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="BlockingWebConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>blockingweb.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+</root>
@@ -6,6 +6,7 @@ using System.IO;
 using System.Configuration;
 using System.Web;
 using System.Text.RegularExpressions;
+using System.Web.Hosting;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;

@@ -51,7 +52,23 @@ namespace Umbraco.Core.IO
                return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
        }

-		[Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
+        public static Attempt<string> TryResolveUrl(string virtualPath)
+        {
+            try
+            {
+                if (virtualPath.StartsWith("~"))
+                    return Attempt.Succeed(virtualPath.Replace("~", SystemDirectories.Root).Replace("//", "/"));
+                if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
+                    return Attempt.Succeed(virtualPath);
+                return Attempt.Succeed(VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root));
+            }
+            catch (Exception ex)
+            {
+                return Attempt.Fail(virtualPath, ex);
+            }
+        }
+
+	    [Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
        internal static string ResolveUrlsFromTextString(string text)
        {
            if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
@@ -67,7 +84,7 @@ namespace Umbraco.Core.IO
 						if (tag.Groups[1].Success)
 							url = tag.Groups[1].Value;

-						if (string.IsNullOrEmpty(url) == false)
+						if (String.IsNullOrEmpty(url) == false)
 						{
 							string resolvedUrl = (url.Substring(0, 1) == "/") ? ResolveUrl(url.Substring(1)) : ResolveUrl(url);
 							text = text.Replace(url, resolvedUrl);
@@ -92,10 +109,10 @@ namespace Umbraco.Core.IO
            if (useHttpContext && HttpContext.Current != null)
            {
                //string retval;
-                if (string.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
-                    return System.Web.Hosting.HostingEnvironment.MapPath(path);
+                if (String.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
+                    return HostingEnvironment.MapPath(path);
                else
-                    return System.Web.Hosting.HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
+                    return HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
            }

        	var root = GetRootDirectorySafe();
@@ -115,7 +132,7 @@ namespace Umbraco.Core.IO
        {
            string retval = ConfigurationManager.AppSettings[settingsKey];

-            if (string.IsNullOrEmpty(retval))
+            if (String.IsNullOrEmpty(retval))
                retval = standardPath;

            return retval.TrimEnd('/');
@@ -135,12 +152,7 @@ namespace Umbraco.Core.IO
        /// <returns>A value indicating whether the filepath is valid.</returns>
        internal static bool VerifyEditPath(string filePath, string validDir)
        {
-            if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false)
-                filePath = MapPath(filePath);
-            if (validDir.StartsWith(MapPath(SystemDirectories.Root)) == false)
-                validDir = MapPath(validDir);
-
-            return filePath.StartsWith(validDir);
+            return VerifyEditPath(filePath, new[] { validDir });
        }

        /// <summary>
@@ -165,15 +177,31 @@ namespace Umbraco.Core.IO
        /// <returns>A value indicating whether the filepath is valid.</returns>
        internal static bool VerifyEditPath(string filePath, IEnumerable<string> validDirs)
        {
+            // this is called from ScriptRepository, PartialViewRepository, etc.
+            // filePath is the fullPath (rooted, filesystem path, can be trusted)
+            // validDirs are virtual paths (eg ~/Views)
+            //
+            // except that for templates, filePath actually is a virtual path
+
+            //TODO
+            // what's below is dirty, there are too many ways to get the root dir, etc.
+            // not going to fix everything today
+
+            var mappedRoot = MapPath(SystemDirectories.Root);
+            if (filePath.StartsWith(mappedRoot) == false)
+                filePath = MapPath(filePath);
+
+            // yes we can (see above)
+            //// don't trust what we get, it may contain relative segments
+            //filePath = Path.GetFullPath(filePath);
+
            foreach (var dir in validDirs)
            {
                var validDir = dir;
-                if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false)
-                    filePath = MapPath(filePath);
-                if (validDir.StartsWith(MapPath(SystemDirectories.Root)) == false)
+                if (validDir.StartsWith(mappedRoot) == false)
                    validDir = MapPath(validDir);

-                if (filePath.StartsWith(validDir))
+                if (PathStartsWith(filePath, validDir, Path.DirectorySeparatorChar))
                    return true;
            }

@@ -202,11 +230,8 @@ namespace Umbraco.Core.IO
        /// <returns>A value indicating whether the filepath is valid.</returns>
        internal static bool VerifyFileExtension(string filePath, List<string> validFileExtensions)
        {
-            if (filePath.StartsWith(MapPath(SystemDirectories.Root)) == false)
-                filePath = MapPath(filePath);
-            var f = new FileInfo(filePath);
-            
-            return validFileExtensions.Contains(f.Extension.Substring(1));
+            var ext = Path.GetExtension(filePath);
+            return ext != null && validFileExtensions.Contains(ext.TrimStart('.'));
        }

        /// <summary>
@@ -223,6 +248,16 @@ namespace Umbraco.Core.IO
            return true;
        }

+        public static bool PathStartsWith(string path, string root, char separator)
+        {
+            // either it is identical to root,
+            // or it is root + separator + anything
+
+            if (path.StartsWith(root, StringComparison.OrdinalIgnoreCase) == false) return false;
+            if (path.Length == root.Length) return true;
+            if (path.Length < root.Length) return false;
+            return path[root.Length] == separator;
+        }

        /// <summary>
        /// Returns the path to the root of the application, by getting the path to where the assembly where this
@@ -232,7 +267,7 @@ namespace Umbraco.Core.IO
        /// <returns></returns>
        internal static string GetRootDirectorySafe()
        {
-            if (string.IsNullOrEmpty(_rootDir) == false)
+            if (String.IsNullOrEmpty(_rootDir) == false)
            {
                return _rootDir;
            }
@@ -241,7 +276,7 @@ namespace Umbraco.Core.IO
 			var uri = new Uri(codeBase);
 			var path = uri.LocalPath;
        	var baseDirectory = Path.GetDirectoryName(path);
-            if (string.IsNullOrEmpty(baseDirectory))
+            if (String.IsNullOrEmpty(baseDirectory))
                throw new Exception("No root directory could be resolved. Please ensure that your Umbraco solution is correctly configured.");

            _rootDir = baseDirectory.Contains("bin")
@@ -253,8 +288,8 @@ namespace Umbraco.Core.IO

        internal static string GetRootDirectoryBinFolder()
        {
-            string binFolder = string.Empty;
-            if (string.IsNullOrEmpty(_rootDir))
+            string binFolder = String.Empty;
+            if (String.IsNullOrEmpty(_rootDir))
            {
                binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory.FullName;
                return binFolder;
@@ -298,5 +333,25 @@ namespace Umbraco.Core.IO
            // use string extensions
            return filePath.ToSafeFileName();
        }
+
+	    public static void EnsurePathExists(string path)
+	    {
+	        var absolutePath = IOHelper.MapPath(path);
+	        if (Directory.Exists(absolutePath) == false)
+	            Directory.CreateDirectory(absolutePath);
+	    }
+
+	    public static void EnsureFileExists(string path, string contents)
+	    {
+	        var absolutePath = IOHelper.MapPath(path);
+	        if (File.Exists(absolutePath) == false)
+	        {
+                using (var writer = File.CreateText(absolutePath))
+                {
+                    writer.Write(contents);
+                }
+	        }
+	            
+	    }
    }
 }
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO; 
+using System.IO;
 using System.Linq;
 using Umbraco.Core.Logging;

@@ -9,7 +8,12 @@ namespace Umbraco.Core.IO
 {
    public class PhysicalFileSystem : IFileSystem
    {
-		internal string RootPath { get; private set; }
+        // the rooted, filesystem path, using directory separator chars, NOT ending with a separator
+        // eg "c:" or "c:\path\to\site" or "\\server\path"
+        private readonly string _rootPath;
+
+        // the ??? url, using url separator chars, NOT ending with a separator
+        // eg "" (?) or "/Scripts" or ???
        private readonly string _rootUrl;

        public PhysicalFileSystem(string virtualRoot)
@@ -18,8 +22,13 @@ namespace Umbraco.Core.IO
 			if (virtualRoot.StartsWith("~/") == false)
 				throw new ArgumentException("The virtualRoot argument must be a virtual path and start with '~/'");

-	        RootPath = IOHelper.MapPath(virtualRoot);
+            _rootPath = IOHelper.MapPath(virtualRoot);
+            _rootPath = EnsureDirectorySeparatorChar(_rootPath);
+            _rootPath = _rootPath.TrimEnd(Path.DirectorySeparatorChar);
+
            _rootUrl = IOHelper.ResolveUrl(virtualRoot);
+            _rootUrl = EnsureUrlSeparatorChar(_rootUrl);
+            _rootUrl = _rootUrl.TrimEnd('/');
        }

        public PhysicalFileSystem(string rootPath, string rootUrl)
@@ -33,18 +42,31 @@ namespace Umbraco.Core.IO
 			if (rootPath.StartsWith("~/"))
 				throw new ArgumentException("The rootPath argument cannot be a virtual path and cannot start with '~/'");

-            RootPath = rootPath;
-            _rootUrl = rootUrl;
+            // rootPath should be... rooted, as in, it's a root path!
+            // but the test suite App.config cannot really "root" anything so we'll have to do it here
+
+            //var localRoot = AppDomain.CurrentDomain.BaseDirectory;
+            var localRoot = IOHelper.GetRootDirectorySafe();
+            if (Path.IsPathRooted(rootPath) == false)
+            {
+                rootPath = Path.Combine(localRoot, rootPath);
+            }
+
+            rootPath = EnsureDirectorySeparatorChar(rootPath);
+            rootUrl = EnsureUrlSeparatorChar(rootUrl);
+
+            _rootPath = rootPath.TrimEnd(Path.DirectorySeparatorChar);
+            _rootUrl = rootUrl.TrimEnd('/');
        }

        public IEnumerable<string> GetDirectories(string path)
        {
-            path = EnsureTrailingSeparator(GetFullPath(path));
+            var fullPath = GetFullPath(path);

            try
            {
-                if (Directory.Exists(path))
-                    return Directory.EnumerateDirectories(path).Select(GetRelativePath);
+                if (Directory.Exists(fullPath))
+                    return Directory.EnumerateDirectories(fullPath).Select(GetRelativePath);
            }
            catch (UnauthorizedAccessException ex)
            {
@@ -65,12 +87,13 @@ namespace Umbraco.Core.IO

        public void DeleteDirectory(string path, bool recursive)
        {
-            if (DirectoryExists(path) == false)
+            var fullPath = GetFullPath(path);
+            if (Directory.Exists(fullPath) == false)
                return;

            try
            {
-                Directory.Delete(GetFullPath(path), recursive);
+                Directory.Delete(fullPath, recursive);
            }
            catch (DirectoryNotFoundException ex)
            {
@@ -80,7 +103,8 @@ namespace Umbraco.Core.IO

        public bool DirectoryExists(string path)
        {
-            return Directory.Exists(GetFullPath(path));
+            var fullPath = GetFullPath(path);
+            return Directory.Exists(fullPath);
        }

        public void AddFile(string path, Stream stream)
@@ -90,17 +114,17 @@ namespace Umbraco.Core.IO

        public void AddFile(string path, Stream stream, bool overrideIfExists)
        {
-            var fsRelativePath = GetRelativePath(path);
+            var fullPath = GetFullPath(path);
+            var exists = File.Exists(fullPath);
+            if (exists && overrideIfExists == false) 
+                throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));

-            var exists = FileExists(fsRelativePath);
-            if (exists && overrideIfExists == false) throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
-
-            EnsureDirectory(Path.GetDirectoryName(fsRelativePath));
+            Directory.CreateDirectory(Path.GetDirectoryName(fullPath)); // ensure it exists

            if (stream.CanSeek)
                stream.Seek(0, 0);

-            using (var destination = (Stream)File.Create(GetFullPath(fsRelativePath)))
+            using (var destination = (Stream)File.Create(fullPath))
                stream.CopyTo(destination);
        }

@@ -111,9 +135,7 @@ namespace Umbraco.Core.IO

        public IEnumerable<string> GetFiles(string path, string filter)
        {
-            var fsRelativePath = GetRelativePath(path);
-
-            var fullPath = EnsureTrailingSeparator(GetFullPath(fsRelativePath));
+            var fullPath = GetFullPath(path);

            try
            {
@@ -140,12 +162,13 @@ namespace Umbraco.Core.IO

        public void DeleteFile(string path)
        {
-            if (!FileExists(path))
+            var fullPath = GetFullPath(path);
+            if (File.Exists(fullPath) == false)
                return;

            try
            {
-                File.Delete(GetFullPath(path));
+                File.Delete(fullPath);
            }
            catch (FileNotFoundException ex)
            {
@@ -155,39 +178,86 @@ namespace Umbraco.Core.IO

        public bool FileExists(string path)
        {
-            return File.Exists(GetFullPath(path));
+            var fullpath = GetFullPath(path);
+            return File.Exists(fullpath);
        }

+        // beware, many things depend on how the GetRelative/AbsolutePath methods work!
+
+        /// <summary>
+        /// Gets the relative path.
+        /// </summary>
+        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <returns>The path, relative to this filesystem's root.</returns>
+        /// <remarks>
+        /// <para>The relative path is relative to this filesystem's root, not starting with any
+        /// directory separator. If input was recognized as a url (path), then output uses url (path) separator
+        /// chars.</para>
+        /// </remarks>
        public string GetRelativePath(string fullPathOrUrl)
        {
-            var relativePath = fullPathOrUrl
-                .TrimStart(_rootUrl)
-                .Replace('/', Path.DirectorySeparatorChar)
-                .TrimStart(RootPath)
-                .TrimStart(Path.DirectorySeparatorChar);
+            // test url
+            var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char

-            return relativePath;
+            if (IOHelper.PathStartsWith(path, _rootUrl, '/')) // if it starts with the root url...
+                return path.Substring(_rootUrl.Length) // strip it
+                            .TrimStart('/'); // it's relative
+
+            // test path
+            path = EnsureDirectorySeparatorChar(fullPathOrUrl);
+
+            if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar)) // if it starts with the root path
+                return path.Substring(_rootPath.Length) // strip it
+                            .TrimStart(Path.DirectorySeparatorChar); // it's relative
+
+            // unchanged - including separators
+            return fullPathOrUrl;
        }

+        /// <summary>
+        /// Gets the full path.
+        /// </summary>
+        /// <param name="path">The full or relative path.</param>
+        /// <returns>The full path.</returns>
+        /// <remarks>
+        /// <para>On the physical filesystem, the full path is the rooted (ie non-relative), safe (ie within this
+        /// filesystem's root) path. All separators are converted to Path.DirectorySeparatorChar.</para>
+        /// </remarks>
        public string GetFullPath(string path)
        {
-            //if the path starts with a '/' then it's most likely not a FS relative path which is required so convert it
-            if (path.StartsWith("/"))
-            {
-                path = GetRelativePath(path);
-            }
+            // normalize
+            var opath = path;
+            path = EnsureDirectorySeparatorChar(path);

-            return !path.StartsWith(RootPath) 
-                ? Path.Combine(RootPath, path)
-                : path;
+            // not sure what we are doing here - so if input starts with a (back) slash,
+            // we assume it's not a FS relative path and we try to convert it... but it
+            // really makes little sense?
+            if (path.StartsWith(Path.DirectorySeparatorChar.ToString()))
+                path = GetRelativePath(path);
+
+            // if already a full path, return
+            if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
+                return path;
+
+            // else combine and sanitize, ie GetFullPath will take care of any relative
+            // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
+            // if the combined path reaches illegal parts of the filesystem
+            var fpath = Path.Combine(_rootPath, path);
+            fpath = Path.GetFullPath(fpath);
+
+            // at that point, path is within legal parts of the filesystem, ie we have
+            // permissions to reach that path, but it may nevertheless be outside of
+            // our root path, due to relative segments, so better check
+            if (IOHelper.PathStartsWith(fpath, _rootPath, Path.DirectorySeparatorChar))
+                return fpath;
+
+            throw new FileSecurityException("File '" + opath + "' is outside this filesystem's root.");
        }

        public string GetUrl(string path)
        {
-            return _rootUrl.TrimEnd("/") + "/" + path
-                .TrimStart(Path.DirectorySeparatorChar)
-                .Replace(Path.DirectorySeparatorChar, '/')
-                .TrimEnd("/");
+            path = EnsureUrlSeparatorChar(path).Trim('/');
+            return _rootUrl + "/" + path;
        }

        public DateTimeOffset GetLastModified(string path)
@@ -214,9 +284,19 @@ namespace Umbraco.Core.IO

        protected string EnsureTrailingSeparator(string path)
        {
-            if (!path.EndsWith(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal))
-                path = path + Path.DirectorySeparatorChar;
+            return path.EnsureEndsWith(Path.DirectorySeparatorChar);
+        }

+        protected string EnsureDirectorySeparatorChar(string path)
+        {
+            path = path.Replace('/', Path.DirectorySeparatorChar);
+            path = path.Replace('\\', Path.DirectorySeparatorChar);
+            return path;
+        }
+
+        protected string EnsureUrlSeparatorChar(string path)
+        {
+            path = path.Replace('\\', '/');
            return path;
        }

@@ -154,7 +154,7 @@ namespace Umbraco.Core.IO
        {
            get
            {
-                return IOHelper.ReturnPath("umbracoWebservicesPath", "~/umbraco/webservices");
+                return IOHelper.ReturnPath("umbracoWebservicesPath", Umbraco.EnsureEndsWith("/") + "webservices");
            }
        }

@@ -199,8 +199,8 @@ namespace Umbraco.Core.IO
                using (var image = Image.FromStream(fs))
                {
                    var fileNameThumb = string.IsNullOrWhiteSpace(fileNameAddition)
-                        ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
-                        : string.Format("{0}_{1}.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);
+                        ? string.Format("{0}_UMBRACOSYSTHUMBNAIL." + Extension, Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
+                        : string.Format("{0}_{1}." + Extension, Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);

                    var thumbnail = maxWidthHeight == -1
                        ? ImageHelper.GenerateThumbnail(image, width, height, fileNameThumb, Extension, _fs)
@@ -0,0 +1,105 @@
+using System;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <remarks>
+    /// Based on https://github.com/cjbhaines/Log4Net.Async
+    /// </remarks>
+    public abstract class AsyncForwardingAppenderBase : ForwardingAppender
+    {
+        #region Private Members
+
+        private const FixFlags DefaultFixFlags = FixFlags.Partial;
+        private FixFlags _fixFlags = DefaultFixFlags;
+        private LoggingEventHelper _loggingEventHelper;
+
+        #endregion Private Members
+
+        #region Properties
+
+        public FixFlags Fix
+        {
+            get { return _fixFlags; }
+            set { SetFixFlags(value); }
+        }
+
+        /// <summary>
+        /// The logger name that will be used for logging internal errors.
+        /// </summary>
+        protected abstract string InternalLoggerName { get; }
+
+        public abstract int? BufferSize { get; set; }
+
+        #endregion Properties
+
+        public override void ActivateOptions()
+        {
+            base.ActivateOptions();
+            _loggingEventHelper = new LoggingEventHelper(InternalLoggerName, DefaultFixFlags);
+            InitializeAppenders();
+        }
+
+        #region Appender Management
+
+        public override void AddAppender(IAppender newAppender)
+        {
+            base.AddAppender(newAppender);
+            SetAppenderFixFlags(newAppender);
+        }
+
+        private void SetFixFlags(FixFlags newFixFlags)
+        {
+            if (newFixFlags != _fixFlags)
+            {
+                _loggingEventHelper.Fix = newFixFlags;
+                _fixFlags = newFixFlags;
+                InitializeAppenders();
+            }
+        }
+
+        private void InitializeAppenders()
+        {
+            foreach (var appender in Appenders)
+            {
+                SetAppenderFixFlags(appender);
+            }
+        }
+
+        private void SetAppenderFixFlags(IAppender appender)
+        {
+            var bufferingAppender = appender as BufferingAppenderSkeleton;
+            if (bufferingAppender != null)
+            {
+                bufferingAppender.Fix = Fix;
+            }
+        }
+
+        #endregion Appender Management
+
+        #region Forwarding
+
+        protected void ForwardInternalError(string message, Exception exception, Type thisType)
+        {
+            LogLog.Error(thisType, message, exception);
+            var loggingEvent = _loggingEventHelper.CreateLoggingEvent(Level.Error, message, exception);
+            ForwardLoggingEvent(loggingEvent, thisType);
+        }
+
+        protected void ForwardLoggingEvent(LoggingEvent loggingEvent, Type thisType)
+        {
+            try
+            {
+                base.Append(loggingEvent);
+            }
+            catch (Exception exception)
+            {
+                LogLog.Error(thisType, "Unable to forward logging event", exception);
+            }
+        }
+
+        #endregion Forwarding
+    }
+}
@@ -1,276 +1,276 @@
+using log4net.Core;
+using log4net.Util;
 using System;
+using System.Runtime.Remoting.Messaging;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using log4net.Appender;
-using log4net.Core;
-using log4net.Util;

 namespace Umbraco.Core.Logging
 {
-	/// <summary>
-	/// Based on code by Chris Haines http://cjbhaines.wordpress.com/2012/02/13/asynchronous-log4net-appenders/
+    /// <summary>
+    /// Based on https://github.com/cjbhaines/Log4Net.Async
+    /// which is based on code by Chris Haines http://cjbhaines.wordpress.com/2012/02/13/asynchronous-log4net-appenders/
 	/// </summary>
 	public class AsynchronousRollingFileAppender : RollingFileAppender
 	{
-		private readonly ManualResetEvent _manualResetEvent;
-		private int _bufferOverflowCounter;
-		private bool _forceStop;
-		private bool _hasFinished;
-		private DateTime _lastLoggedBufferOverflow;
-		private bool _logBufferOverflow;
-		private RingBuffer<LoggingEvent> _pendingAppends;
-		private int _queueSizeLimit = 1000;
-		private bool _shuttingDown;
+		private RingBuffer<LoggingEvent> pendingAppends;
+        private readonly ManualResetEvent manualResetEvent;
+        private bool shuttingDown;
+        private bool hasFinished;
+        private bool forceStop;
+        private bool logBufferOverflow;
+        private int bufferOverflowCounter;
+        private DateTime lastLoggedBufferOverflow;
+        private int queueSizeLimit = 1000;
+        public int QueueSizeLimit
+        {
+            get
+            {
+                return queueSizeLimit;
+            }
+            set
+            {
+                queueSizeLimit = value;
+            }
+        }

-		public AsynchronousRollingFileAppender()
-		{
-			_manualResetEvent = new ManualResetEvent(false);
-		}
+        public AsynchronousRollingFileAppender()
+        {
+            manualResetEvent = new ManualResetEvent(false);
+        }

-		public int QueueSizeLimit
-		{
-			get { return _queueSizeLimit; }
-			set { _queueSizeLimit = value; }
-		}
+        public override void ActivateOptions()
+        {
+            base.ActivateOptions();
+            pendingAppends = new RingBuffer<LoggingEvent>(QueueSizeLimit);
+            pendingAppends.BufferOverflow += OnBufferOverflow;
+            StartAppendTask();
+        }

-		public override void ActivateOptions()
-		{
-			base.ActivateOptions();
-			_pendingAppends = new RingBuffer<LoggingEvent>(QueueSizeLimit);
-			_pendingAppends.BufferOverflow += OnBufferOverflow;
-			StartAppendTask();
-		}
+        protected override void Append(LoggingEvent[] loggingEvents)
+        {
+            Array.ForEach(loggingEvents, Append);
+        }

-		protected override void Append(LoggingEvent[] loggingEvents)
-		{
-			Array.ForEach(loggingEvents, Append);
-		}
+        protected override void Append(LoggingEvent loggingEvent)
+        {
+            if (FilterEvent(loggingEvent))
+            {
+                pendingAppends.Enqueue(loggingEvent);
+            }
+        }

-		protected override void Append(LoggingEvent loggingEvent)
-		{
-			if (FilterEvent(loggingEvent))
-			{
-				_pendingAppends.Enqueue(loggingEvent);
-			}
-		}
+        protected override void OnClose()
+        {
+            shuttingDown = true;
+            manualResetEvent.WaitOne(TimeSpan.FromSeconds(5));

-		protected override void OnClose()
-		{
-			_shuttingDown = true;
-			_manualResetEvent.WaitOne(TimeSpan.FromSeconds(5));
+            if (!hasFinished)
+            {
+                forceStop = true;
+                base.Append(new LoggingEvent(new LoggingEventData
+                {
+                    Level = Level.Error,
+                    Message = "Unable to clear out the AsyncRollingFileAppender buffer in the allotted time, forcing a shutdown",
+                    TimeStamp = DateTime.UtcNow,
+                    Identity = "",
+                    ExceptionString = "",
+                    UserName = WindowsIdentity.GetCurrent() != null ? WindowsIdentity.GetCurrent().Name : "",
+                    Domain = AppDomain.CurrentDomain.FriendlyName,
+                    ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+                    LocationInfo = new LocationInfo(this.GetType().Name, "OnClose", "AsyncRollingFileAppender.cs", "75"),
+                    LoggerName = this.GetType().FullName,
+                    Properties = new PropertiesDictionary(),
+                })
+                 );
+            }

-			if (!_hasFinished)
-			{
-				_forceStop = true;
-				var windowsIdentity = WindowsIdentity.GetCurrent();
+            base.OnClose();
+        }

-			    var logEvent = new LoggingEvent(new LoggingEventData
-			        {
-			            Level = global::log4net.Core.Level.Error,
-			            Message =
-			                "Unable to clear out the AsynchronousRollingFileAppender buffer in the allotted time, forcing a shutdown",
-			            TimeStamp = DateTime.UtcNow,
-			            Identity = "",
-			            ExceptionString = "",
-			            UserName = windowsIdentity != null ? windowsIdentity.Name : "",
-			            Domain = AppDomain.CurrentDomain.FriendlyName,
-			            ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
-			            LocationInfo =
-			                new LocationInfo(this.GetType().Name, "OnClose", "AsynchronousRollingFileAppender.cs", "59"),
-			            LoggerName = this.GetType().FullName,
-			            Properties = new PropertiesDictionary(),
-			        });
+        private void StartAppendTask()
+        {
+            if (!shuttingDown)
+            {
+                Task appendTask = new Task(AppendLoggingEvents, TaskCreationOptions.LongRunning);
+                appendTask.LogErrors(LogAppenderError).ContinueWith(x => StartAppendTask()).LogErrors(LogAppenderError);
+                appendTask.Start();
+            }
+        }

-			    if (this.DateTimeStrategy != null)
-			    {
-                    base.Append(logEvent);
-			    }			    
-			}
+        private void LogAppenderError(string logMessage, Exception exception)
+        {
+            base.Append(new LoggingEvent(new LoggingEventData
+            {
+                Level = Level.Error,
+                Message = "Appender exception: " + logMessage,
+                TimeStamp = DateTime.UtcNow,
+                Identity = "",
+                ExceptionString = exception.ToString(),
+                UserName = WindowsIdentity.GetCurrent() != null ? WindowsIdentity.GetCurrent().Name : "",
+                Domain = AppDomain.CurrentDomain.FriendlyName,
+                ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+                LocationInfo = new LocationInfo(this.GetType().Name, "LogAppenderError", "AsyncRollingFileAppender.cs", "152"),
+                LoggerName = this.GetType().FullName,
+                Properties = new PropertiesDictionary(),
+            }));
+        }

-			base.OnClose();
-		}
+        private void AppendLoggingEvents()
+        {
+            LoggingEvent loggingEventToAppend;
+            while (!shuttingDown)
+            {
+                if (logBufferOverflow)
+                {
+                    LogBufferOverflowError();
+                    logBufferOverflow = false;
+                    bufferOverflowCounter = 0;
+                    lastLoggedBufferOverflow = DateTime.UtcNow;
+                }

-		private void StartAppendTask()
-		{
-			if (!_shuttingDown)
-			{
-				Task appendTask = new Task(AppendLoggingEvents, TaskCreationOptions.LongRunning);
-				appendTask.LogErrors(LogAppenderError).ContinueWith(x => StartAppendTask()).LogErrors(LogAppenderError);
-				appendTask.Start();
-			}
-		}
+                while (!pendingAppends.TryDequeue(out loggingEventToAppend))
+                {
+                    Thread.Sleep(10);
+                    if (shuttingDown)
+                    {
+                        break;
+                    }
+                }
+                if (loggingEventToAppend == null)
+                {
+                    continue;
+                }

-		private void LogAppenderError(string logMessage, Exception exception)
-		{
-			var windowsIdentity = WindowsIdentity.GetCurrent();
-			base.Append(new LoggingEvent(new LoggingEventData
-				{
-					Level = Level.Error,
-					Message = "Appender exception: " + logMessage,
-					TimeStamp = DateTime.UtcNow,
-					Identity = "",
-					ExceptionString = exception.ToString(),
-					UserName = windowsIdentity != null ? windowsIdentity.Name : "",
-					Domain = AppDomain.CurrentDomain.FriendlyName,
-					ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
-					LocationInfo =
-						new LocationInfo(this.GetType().Name,
-						                 "LogAppenderError",
-						                 "AsynchronousRollingFileAppender.cs",
-						                 "100"),
-					LoggerName = this.GetType().FullName,
-					Properties = new PropertiesDictionary(),
-				}));
-		}
+                try
+                {
+                    base.Append(loggingEventToAppend);
+                }
+                catch
+                {
+                }
+            }

-		private void AppendLoggingEvents()
-		{
-			LoggingEvent loggingEventToAppend;
-			while (!_shuttingDown)
-			{
-				if (_logBufferOverflow)
-				{
-					LogBufferOverflowError();
-					_logBufferOverflow = false;
-					_bufferOverflowCounter = 0;
-					_lastLoggedBufferOverflow = DateTime.UtcNow;
-				}
+            while (pendingAppends.TryDequeue(out loggingEventToAppend) && !forceStop)
+            {
+                try
+                {
+                    base.Append(loggingEventToAppend);
+                }
+                catch
+                {
+                }
+            }
+            hasFinished = true;
+            manualResetEvent.Set();
+        }

-				while (!_pendingAppends.TryDequeue(out loggingEventToAppend))
-				{
-					Thread.Sleep(10);
-					if (_shuttingDown)
-					{
-						break;
-					}
-				}
-				if (loggingEventToAppend == null)
-				{
-					continue;
-				}
+        private void LogBufferOverflowError()
+        {
+            base.Append(new LoggingEvent(new LoggingEventData
+            {
+                Level = Level.Error,
+                Message = string.Format("Buffer overflow. {0} logging events have been lost in the last 30 seconds. [QueueSizeLimit: {1}]", bufferOverflowCounter, QueueSizeLimit),
+                TimeStamp = DateTime.UtcNow,
+                Identity = "",
+                ExceptionString = "",
+                UserName = WindowsIdentity.GetCurrent() != null ? WindowsIdentity.GetCurrent().Name : "",
+                Domain = AppDomain.CurrentDomain.FriendlyName,
+                ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+                LocationInfo = new LocationInfo(this.GetType().Name, "LogBufferOverflowError", "AsyncRollingFileAppender.cs", "152"),
+                LoggerName = this.GetType().FullName,
+                Properties = new PropertiesDictionary(),
+            }));
+        }

-				try
-				{
-					base.Append(loggingEventToAppend);
-				}
-				catch
-				{
-				}
-			}
+        private void OnBufferOverflow(object sender, EventArgs eventArgs)
+        {
+            bufferOverflowCounter++;
+            if (logBufferOverflow == false)
+            {
+                if (lastLoggedBufferOverflow < DateTime.UtcNow.AddSeconds(-30))
+                {
+                    logBufferOverflow = true;
+                }
+            }
+        }
+    }

-			while (_pendingAppends.TryDequeue(out loggingEventToAppend) && !_forceStop)
-			{
-				try
-				{
-					base.Append(loggingEventToAppend);
-				}
-				catch
-				{
-				}
-			}
-			_hasFinished = true;
-			_manualResetEvent.Set();
-		}
+    internal interface IQueue<T>
+    {
+        void Enqueue(T item);
+        bool TryDequeue(out T ret);
+    }

-		private void LogBufferOverflowError()
-		{
-			var windowsIdentity = WindowsIdentity.GetCurrent();
-			base.Append(new LoggingEvent(new LoggingEventData
-				{
-					Level = Level.Error,
-					Message =
-						string.Format(
-							"Buffer overflow. {0} logging events have been lost in the last 30 seconds. [QueueSizeLimit: {1}]",
-							_bufferOverflowCounter,
-							QueueSizeLimit),
-					TimeStamp = DateTime.UtcNow,
-					Identity = "",
-					ExceptionString = "",
-					UserName = windowsIdentity != null ? windowsIdentity.Name : "",
-					Domain = AppDomain.CurrentDomain.FriendlyName,
-					ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
-					LocationInfo =
-						new LocationInfo(this.GetType().Name,
-						                 "LogBufferOverflowError",
-						                 "AsynchronousRollingFileAppender.cs",
-						                 "172"),
-					LoggerName = this.GetType().FullName,
-					Properties = new PropertiesDictionary(),
-				}));
-		}
+    internal class RingBuffer<T> : IQueue<T>
+    {
+        private readonly object lockObject = new object();
+        private readonly T[] buffer;
+        private readonly int size;
+        private int readIndex = 0;
+        private int writeIndex = 0;
+        private bool bufferFull = false;

-		private void OnBufferOverflow(object sender, EventArgs eventArgs)
-		{
-			_bufferOverflowCounter++;
-			if (_logBufferOverflow == false)
-			{
-				if (_lastLoggedBufferOverflow < DateTime.UtcNow.AddSeconds(-30))
-				{
-					_logBufferOverflow = true;
-				}
-			}
-		}
+        public int Size { get { return size; } }

-		private class RingBuffer<T>
-		{
-			private readonly object _lockObject = new object();
-			private readonly T[] _buffer;
-			private readonly int _size;
-			private int _readIndex = 0;
-			private int _writeIndex = 0;
-			private bool _bufferFull = false;
+        public event Action<object, EventArgs> BufferOverflow;

-			public event Action<object, EventArgs> BufferOverflow;
+        public RingBuffer(int size)
+        {
+            this.size = size;
+            buffer = new T[size];
+        }

-			public RingBuffer(int size)
-			{
-				this._size = size;
-				_buffer = new T[size];
-			}
+        public void Enqueue(T item)
+        {
+            var bufferWasFull = false;
+            lock (lockObject)
+            {
+                buffer[writeIndex] = item;
+                writeIndex = (++writeIndex) % size;
+                if (bufferFull)
+                {
+                    bufferWasFull = true;
+                    readIndex = writeIndex;
+                }
+                else if (writeIndex == readIndex)
+                {
+                    bufferFull = true;
+                }
+            }

-			public void Enqueue(T item)
-			{
-				lock (_lockObject)
-				{
-					_buffer[_writeIndex] = item;
-					_writeIndex = (++_writeIndex) % _size;
-					if (_bufferFull)
-					{
-						if (BufferOverflow != null)
-						{
-							BufferOverflow(this, EventArgs.Empty);
-						}
-						_readIndex = _writeIndex;
-					}
-					else if (_writeIndex == _readIndex)
-					{
-						_bufferFull = true;
-					}
-				}
-			}
+            if (bufferWasFull)
+            {
+                if (BufferOverflow != null)
+                {
+                    BufferOverflow(this, EventArgs.Empty);
+                }
+            }
+        }

-			public bool TryDequeue(out T ret)
-			{
-				if (_readIndex == _writeIndex && !_bufferFull)
-				{
-					ret = default(T);
-					return false;
-				}
-				lock (_lockObject)
-				{
-					if (_readIndex == _writeIndex && !_bufferFull)
-					{
-						ret = default(T);
-						return false;
-					}
+        public bool TryDequeue(out T ret)
+        {
+            if (readIndex == writeIndex && !bufferFull)
+            {
+                ret = default(T);
+                return false;
+            }
+            lock (lockObject)
+            {
+                if (readIndex == writeIndex && !bufferFull)
+                {
+                    ret = default(T);
+                    return false;
+                }

-					ret = _buffer[_readIndex];
-					_readIndex = (++_readIndex) % _size;
-					_bufferFull = false;
-					return true;
-				}
-			}
-		}
-	}
+                ret = buffer[readIndex];
+                buffer[readIndex] = default(T);
+                readIndex = (++readIndex) % size;
+                bufferFull = false;
+                return true;
+            }
+        }
+    }
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -12,15 +13,20 @@ namespace Umbraco.Core.Logging
 	/// Used for logging
 	///</summary>
    public class Logger : ILogger
-	{
+    {
+
        public Logger(FileInfo log4NetConfigFile)
+            :this()
        {
            XmlConfigurator.Configure(log4NetConfigFile);
        }

        private Logger()
        {
-            
+            //Add custom global properties to the log4net context that we can use in our logging output
+
+            log4net.GlobalContext.Properties["processId"] = Process.GetCurrentProcess().Id;
+            log4net.GlobalContext.Properties["appDomainId"] = AppDomain.CurrentDomain.Id;
        }

        /// <summary>
@@ -53,31 +59,19 @@ namespace Umbraco.Core.Logging
 			
 			return LogManager.GetLogger(getTypeFromInstance.GetType());
 		}
-
-		/// <summary>
-		/// Useful if the logger itself is running on another thread
-		/// </summary>
-		/// <param name="generateMessageFormat"></param>
-		/// <returns></returns>
-		private string PrefixThreadId(string generateMessageFormat)
-		{
-			return "[Thread " + Thread.CurrentThread.ManagedThreadId + "] " + generateMessageFormat;
-		}
-
+        
 		public void Error(Type callingType, string message, Exception exception)
 		{
 			var logger = LogManager.GetLogger(callingType);
 			if (logger != null)
-				logger.Error(PrefixThreadId(message), exception);
+				logger.Error((message), exception);
 		}

-
-
 		public void Warn(Type callingType, string message, params Func<object>[] formatItems)
 		{
 			var logger = LogManager.GetLogger(callingType);
 			if (logger == null || logger.IsWarnEnabled == false) return;
-			logger.WarnFormat(PrefixThreadId(message), formatItems.Select(x => x.Invoke()).ToArray());
+			logger.WarnFormat((message), formatItems.Select(x => x.Invoke()).ToArray());
 		}

 		public void Warn(Type callingType, string message, bool showHttpTrace, params Func<object>[] formatItems)
@@ -92,7 +86,7 @@ namespace Umbraco.Core.Logging

 			var logger = LogManager.GetLogger(callingType);
 			if (logger == null || logger.IsWarnEnabled == false) return;
-			logger.WarnFormat(PrefixThreadId(message), formatItems.Select(x => x.Invoke()).ToArray());
+			logger.WarnFormat((message), formatItems.Select(x => x.Invoke()).ToArray());

 		}

@@ -105,7 +99,7 @@ namespace Umbraco.Core.Logging
            var logger = LogManager.GetLogger(callingType);
            if (logger == null || logger.IsWarnEnabled == false) return;
            var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
-            logger.WarnFormat(PrefixThreadId(message) + ". Exception: " + e, executedParams);		
+            logger.WarnFormat((message) + ". Exception: " + e, executedParams);		
 		}

 		/// <summary>
@@ -117,7 +111,7 @@ namespace Umbraco.Core.Logging
 		{
 			var logger = LogManager.GetLogger(callingType);
 			if (logger == null || logger.IsInfoEnabled == false) return;
-			logger.Info(PrefixThreadId(generateMessage.Invoke()));
+			logger.Info((generateMessage.Invoke()));
 		}

 		/// <summary>
@@ -131,7 +125,7 @@ namespace Umbraco.Core.Logging
 			var logger = LogManager.GetLogger(type);
 			if (logger == null || logger.IsInfoEnabled == false) return;
 			var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
-			logger.InfoFormat(PrefixThreadId(generateMessageFormat), executedParams);
+			logger.InfoFormat((generateMessageFormat), executedParams);
 		}


@@ -144,7 +138,7 @@ namespace Umbraco.Core.Logging
 		{
 			var logger = LogManager.GetLogger(callingType);
 			if (logger == null || logger.IsDebugEnabled == false) return;
-			logger.Debug(PrefixThreadId(generateMessage.Invoke()));
+			logger.Debug((generateMessage.Invoke()));
 		}

 		/// <summary>
@@ -158,7 +152,7 @@ namespace Umbraco.Core.Logging
 			var logger = LogManager.GetLogger(type);
 			if (logger == null || logger.IsDebugEnabled == false) return;
 			var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
-			logger.DebugFormat(PrefixThreadId(generateMessageFormat), executedParams);
+			logger.DebugFormat((generateMessageFormat), executedParams);
 		}


@@ -0,0 +1,17 @@
+using log4net.Core;
+
+namespace Umbraco.Core.Logging
+{
+    /// <remarks>
+    /// Based on https://github.com/cjbhaines/Log4Net.Async
+    /// </remarks>
+    internal class LoggingEventContext
+    {
+        public LoggingEventContext(LoggingEvent loggingEvent)
+        {
+            LoggingEvent = loggingEvent;
+        }
+
+        public LoggingEvent LoggingEvent { get; set; }
+    }
+}
@@ -0,0 +1,31 @@
+using System;
+using log4net.Core;
+
+namespace Umbraco.Core.Logging
+{
+    /// <remarks>
+    /// Based on https://github.com/cjbhaines/Log4Net.Async
+    /// </remarks>
+    internal class LoggingEventHelper
+    {
+        // needs to be a seperate class so that location is determined correctly by log4net when required
+
+        private static readonly Type HelperType = typeof(LoggingEventHelper);
+        private readonly string loggerName;
+
+        public FixFlags Fix { get; set; }
+
+        public LoggingEventHelper(string loggerName, FixFlags fix)
+        {
+            this.loggerName = loggerName;
+            Fix = fix;
+        }
+
+        public LoggingEvent CreateLoggingEvent(Level level, string message, Exception exception)
+        {
+            var loggingEvent = new LoggingEvent(HelperType, null, loggerName, level, message, exception);
+            loggingEvent.Fix = Fix;
+            return loggingEvent;
+        }
+    }
+}
@@ -0,0 +1,307 @@
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using log4net.Core;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// An asynchronous appender based on <see cref="BlockingCollection{T}"/>
+    /// </summary>
+    /// <remarks>
+    /// Based on https://github.com/cjbhaines/Log4Net.Async
+    /// </remarks>
+    public class ParallelForwardingAppender : AsyncForwardingAppenderBase, IDisposable
+    {
+        #region Private Members
+
+        private const int DefaultBufferSize = 1000;
+        private BlockingCollection<LoggingEventContext> _loggingEvents;
+        private CancellationTokenSource _loggingCancelationTokenSource;
+        private CancellationToken _loggingCancelationToken;
+        private Task _loggingTask;
+        private Double _shutdownFlushTimeout = 1;
+        private TimeSpan _shutdownFlushTimespan = TimeSpan.FromSeconds(1);
+        private static readonly Type ThisType = typeof(ParallelForwardingAppender);
+        private volatile bool _shutDownRequested;
+        private int? _bufferSize = DefaultBufferSize;
+
+        #endregion Private Members
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the number of LoggingEvents that will be buffered.  Set to null for unlimited.
+        /// </summary>
+        public override int? BufferSize
+        {
+            get { return _bufferSize; }
+            set { _bufferSize = value; }
+        }
+
+        public int BufferEntryCount
+        {
+            get
+            {
+                if (_loggingEvents == null) return 0;
+                return _loggingEvents.Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the time period in which the system will wait for appenders to flush before canceling the background task.
+        /// </summary>
+        public Double ShutdownFlushTimeout
+        {
+            get
+            {
+                return _shutdownFlushTimeout;
+            }
+            set
+            {
+                _shutdownFlushTimeout = value;
+            }
+        }
+
+        protected override string InternalLoggerName
+        {
+            get { return "ParallelForwardingAppender"; }
+        }
+
+        #endregion Properties
+
+        #region Startup
+
+        public override void ActivateOptions()
+        {
+            base.ActivateOptions();
+            _shutdownFlushTimespan = TimeSpan.FromSeconds(_shutdownFlushTimeout);
+            StartForwarding();
+        }
+
+        private void StartForwarding()
+        {
+            if (_shutDownRequested)
+            {
+                return;
+            }
+            //Create a collection which will block the thread and wait for new entries
+            //if the collection is empty
+            if (BufferSize.HasValue && BufferSize > 0)
+            {
+                _loggingEvents = new BlockingCollection<LoggingEventContext>(BufferSize.Value);
+            }
+            else
+            {
+                //No limit on the number of events.
+                _loggingEvents = new BlockingCollection<LoggingEventContext>();
+            }
+            //The cancellation token is used to cancel a running task gracefully.
+            _loggingCancelationTokenSource = new CancellationTokenSource();
+            _loggingCancelationToken = _loggingCancelationTokenSource.Token;
+            _loggingTask = new Task(SubscriberLoop, _loggingCancelationToken);
+            _loggingTask.Start();
+        }
+
+        #endregion Startup
+
+        #region Shutdown
+
+        private void CompleteSubscriberTask()
+        {
+            _shutDownRequested = true;
+            if (_loggingEvents == null || _loggingEvents.IsAddingCompleted)
+            {
+                return;
+            }
+            //Don't allow more entries to be added.
+            _loggingEvents.CompleteAdding();
+            //Allow some time to flush
+            Thread.Sleep(_shutdownFlushTimespan);
+            if (!_loggingTask.IsCompleted && !_loggingCancelationToken.IsCancellationRequested)
+            {
+                _loggingCancelationTokenSource.Cancel();
+                //Wait here so that the error logging messages do not get into a random order.
+                //Don't pass the cancellation token because we are not interested
+                //in catching the OperationCanceledException that results.
+                _loggingTask.Wait();
+            }
+            if (!_loggingEvents.IsCompleted)
+            {
+                ForwardInternalError("The buffer was not able to be flushed before timeout occurred.", null, ThisType);
+            }
+        }
+
+        protected override void OnClose()
+        {
+            CompleteSubscriberTask();
+            base.OnClose();
+        }
+
+        #endregion Shutdown
+
+        #region Appending
+
+        protected override void Append(LoggingEvent loggingEvent)
+        {
+            if (_loggingEvents == null || _loggingEvents.IsAddingCompleted || loggingEvent == null)
+            {
+                return;
+            }
+
+            loggingEvent.Fix = Fix;
+            //In the case where blocking on a full collection, and the task is subsequently completed, the cancellation token
+            //will prevent the entry from attempting to add to the completed collection which would result in an exception.
+            _loggingEvents.Add(new LoggingEventContext(loggingEvent), _loggingCancelationToken);
+        }
+
+        protected override void Append(LoggingEvent[] loggingEvents)
+        {
+            if (_loggingEvents == null || _loggingEvents.IsAddingCompleted || loggingEvents == null)
+            {
+                return;
+            }
+
+            foreach (var loggingEvent in loggingEvents)
+            {
+                Append(loggingEvent);
+            }
+        }
+
+        #endregion Appending
+
+        #region Forwarding
+
+        /// <summary>
+        /// Iterates over a BlockingCollection containing LoggingEvents.
+        /// </summary>
+        private void SubscriberLoop()
+        {
+            Thread.CurrentThread.Name = String.Format("{0} ParallelForwardingAppender Subscriber Task", Name);
+            //The task will continue in a blocking loop until
+            //the queue is marked as adding completed, or the task is canceled.
+            try
+            {
+                //This call blocks until an item is available or until adding is completed
+                foreach (var entry in _loggingEvents.GetConsumingEnumerable(_loggingCancelationToken))
+                {
+                    ForwardLoggingEvent(entry.LoggingEvent, ThisType);
+                }
+            }
+            catch (OperationCanceledException ex)
+            {
+                //The thread was canceled before all entries could be forwarded and the collection completed.
+                ForwardInternalError("Subscriber task was canceled before completion.", ex, ThisType);
+                //Cancellation is called in the CompleteSubscriberTask so don't call that again.
+            }
+            catch (ThreadAbortException ex)
+            {
+                //Thread abort may occur on domain unload.
+                ForwardInternalError("Subscriber task was aborted.", ex, ThisType);
+                //Cannot recover from a thread abort so complete the task.
+                CompleteSubscriberTask();
+                //The exception is swallowed because we don't want the client application
+                //to halt due to a logging issue.
+            }
+            catch (Exception ex)
+            {
+                //On exception, try to log the exception
+                ForwardInternalError("Subscriber task error in forwarding loop.", ex, ThisType);
+                //Any error in the loop is going to be some sort of extenuating circumstance from which we
+                //probably cannot recover anyway.   Complete subscribing.
+                CompleteSubscriberTask();
+            }
+        }
+
+        #endregion Forwarding
+
+        #region IDisposable Implementation
+
+        private bool _disposed = false;
+
+        //Implement IDisposable.
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    if (_loggingTask != null)
+                    {
+                        if (!(_loggingTask.IsCanceled || _loggingTask.IsCompleted || _loggingTask.IsFaulted))
+                        {
+                            try
+                            {
+                                CompleteSubscriberTask();
+                            }
+                            catch (Exception ex)
+                            {
+                                LogLog.Error(ThisType, "Exception Completing Subscriber Task in Dispose Method", ex);
+                            }
+                        }
+                        try
+                        {
+                            _loggingTask.Dispose();
+                        }
+                        catch (Exception ex)
+                        {
+                            LogLog.Error(ThisType, "Exception Disposing Logging Task", ex);
+                        }
+                        finally
+                        {
+                            _loggingTask = null;
+                        }
+                    }
+                    if (_loggingEvents != null)
+                    {
+                        try
+                        {
+                            _loggingEvents.Dispose();
+                        }
+                        catch (Exception ex)
+                        {
+                            LogLog.Error(ThisType, "Exception Disposing BlockingCollection", ex);
+                        }
+                        finally
+                        {
+                            _loggingEvents = null;
+                        }
+                    }
+                    if (_loggingCancelationTokenSource != null)
+                    {
+                        try
+                        {
+                            _loggingCancelationTokenSource.Dispose();
+                        }
+                        catch (Exception ex)
+                        {
+                            LogLog.Error(ThisType, "Exception Disposing CancellationTokenSource", ex);
+                        }
+                        finally
+                        {
+                            _loggingCancelationTokenSource = null;
+                        }
+                    }
+                }
+                _disposed = true;
+            }
+        }
+
+        // Use C# destructor syntax for finalization code.
+        ~ParallelForwardingAppender()
+        {
+            // Simply call Dispose(false).
+            Dispose(false);
+        }
+
+        #endregion IDisposable Implementation
+    }
+}
@@ -11,8 +11,12 @@ namespace Umbraco.Core.Macros
 	/// </summary>
 	internal class MacroTagParser
 	{
-        private static readonly Regex MacroRteContent = new Regex(@"(<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(\s*?-->)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
-        private static readonly Regex MacroPersistedFormat = new Regex(@"(<\?UMBRACO_MACRO (?:.+)?macroAlias=[""']([^""\'\n\r]+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+	    private static readonly Regex MacroRteContent = new Regex(@"(<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(\s*?-->)",
+	        RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline);
+
+	    private static readonly Regex MacroPersistedFormat =
+	        new Regex(@"(<\?UMBRACO_MACRO (?:.+?)??macroAlias=[""']([^""\'\n\r]+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)",
+	            RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline);

 	    /// <summary>
 	    /// This formats the persisted string to something useful for the rte so that the macro renders properly since we 
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO.MemoryMappedFiles;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.Hosting;
+using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
+
+namespace Umbraco.Core
+{
+    // represents the main domain
+    class MainDom : IRegisteredObject
+    {
+        #region Vars
+
+        private readonly ILogger _logger;
+
+        // our own lock for local consistency
+        private readonly object _locko = new object();
+
+        // async lock representing the main domain lock
+        private readonly AsyncLock _asyncLock;
+        private IDisposable _asyncLocker;
+
+        // event wait handle used to notify current main domain that it should 
+        // release the lock because a new domain wants to be the main domain
+        private readonly EventWaitHandle _signal;
+
+        // indicates whether...
+        private volatile bool _isMainDom; // we are the main domain
+        private volatile bool _signaled; // we have been signaled
+
+        // actions to run before releasing the main domain
+        private readonly SortedList<int, Action> _callbacks = new SortedList<int, Action>();
+
+        private const int LockTimeoutMilliseconds = 90000; // (1.5 * 60 * 1000) == 1 min 30 seconds
+
+        #endregion
+
+        #region Ctor
+
+        // initializes a new instance of MainDom
+        public MainDom(ILogger logger)
+        {
+            _logger = logger;
+
+            var appId = string.Empty;
+            // HostingEnvironment.ApplicationID is null in unit tests, making ReplaceNonAlphanumericChars fail
+            if (HostingEnvironment.ApplicationID != null)
+                appId = HostingEnvironment.ApplicationID.ReplaceNonAlphanumericChars(string.Empty);
+
+            var lockName = "UMBRACO-" + appId + "-MAINDOM-LCK";
+            _asyncLock = new AsyncLock(lockName);
+
+            var eventName = "UMBRACO-" + appId + "-MAINDOM-EVT";
+            _signal = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
+        }
+
+        #endregion
+
+        // register a main domain consumer
+        public bool Register(Action release, int weight = 100)
+        {
+            return Register(null, release, weight);
+        }
+
+        // register a main domain consumer
+        public bool Register(Action install, Action release, int weight = 100)
+        {
+            lock (_locko)
+            {
+                if (_signaled) return false;
+                if (install != null)
+                    install();
+                if (release != null)
+                    _callbacks.Add(weight, release);
+                return true;
+            }
+        }
+
+        // handles the signal requesting that the main domain is released
+        private void OnSignal(string source)
+        {
+            // once signaled, we stop waiting, but then there is the hosting environment
+            // so we have to make sure that we only enter that method once
+
+            lock (_locko)
+            {
+                _logger.Debug<MainDom>("Signaled" + (_signaled ? " (again)" : "") + " (" + source + ").");
+                if (_signaled) return;
+                if (_isMainDom == false) return; // probably not needed
+                _signaled = true;
+            }
+
+            try
+            {
+                _logger.Debug<MainDom>("Stopping...");
+                foreach (var callback in _callbacks.Values)
+                {
+                    try
+                    {
+                        callback(); // no timeout on callbacks
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.Error<MainDom>("Error while running callback, remaining callbacks will not run.", e);
+                        throw;
+                    }
+                    
+                }
+                _logger.Debug<MainDom>("Stopped.");
+            }
+            finally
+            {
+                // in any case...
+                _isMainDom = false;
+                _asyncLocker.Dispose();
+                _logger.Debug<MainDom>("Released MainDom.");
+            }
+        }
+
+        // acquires the main domain
+        public bool Acquire()
+        {
+            lock (_locko) // we don't want the hosting environment to interfere by signaling
+            {
+                // if signaled, too late to acquire, give up
+                // the handler is not installed so that would be the hosting environment
+                if (_signaled)
+                {
+                    _logger.Debug<MainDom>("Cannot acquire MainDom (signaled).");
+                    return false;
+                }
+
+                _logger.Debug<MainDom>("Acquiring MainDom...");
+
+                // signal other instances that we want the lock, then wait one the lock,
+                // which may timeout, and this is accepted - see comments below
+
+                // signal, then wait for the lock, then make sure the event is
+                // resetted (maybe there was noone listening..)
+                _signal.Set();
+
+                // if more than 1 instance reach that point, one will get the lock
+                // and the other one will timeout, which is accepted
+
+                _asyncLocker = _asyncLock.Lock(LockTimeoutMilliseconds);
+                _isMainDom = true;
+
+                // we need to reset the event, because otherwise we would end up
+                // signaling ourselves and commiting suicide immediately.
+                // only 1 instance can reach that point, but other instances may
+                // have started and be trying to get the lock - they will timeout,
+                // which is accepted
+
+                _signal.Reset();
+                _signal.WaitOneAsync()
+                    .ContinueWith(_ => OnSignal("signal"));
+
+                HostingEnvironment.RegisterObject(this);
+
+                _logger.Debug<MainDom>("Acquired MainDom.");
+                return true;
+            }
+        }
+
+        // gets a value indicating whether we are the main domain
+        public bool IsMainDom
+        {
+            get { return _isMainDom; }
+        }
+
+        // IRegisteredObject
+        public void Stop(bool immediate)
+        {
+            try
+            {
+                OnSignal("environment"); // will run once
+            }
+            finally
+            {
+                HostingEnvironment.UnregisterObject(this);
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More