diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 6067cade4a..4fe812dbeb 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -30,7 +30,7 @@
       <dependency id="xmlrpcnet" version="[2.5.0, 3.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.3.1, 4.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.66, 1.0.0)" />
       <dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
diff --git a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs
index 1e59c8e920..52499bee7d 100644
--- a/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/TemplateFactory.cs
@@ -48,7 +48,6 @@ namespace Umbraco.Core.Persistence.Factories
                 template.IsMasterTemplate = true;
             }
 
-            //TODO: Change this to ParentId: http://issues.umbraco.org/issue/U4-5846
             if(dto.NodeDto.ParentId > 0)
                 template.MasterTemplateId = new Lazy<int>(() => dto.NodeDto.ParentId);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs
index 4366aaa4a6..14957ac49f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
@@ -10,12 +11,17 @@ namespace Umbraco.Core.Persistence.Repositories
         IEnumerable<ITemplate> GetAll(params string[] aliases);
 
         IEnumerable<ITemplate> GetChildren(int masterTemplateId);
+        IEnumerable<ITemplate> GetChildren(string alias);
+
+        IEnumerable<ITemplate> GetDescendants(int masterTemplateId);
+        IEnumerable<ITemplate> GetDescendants(string alias);
 
         /// <summary>
         /// Returns a template as a template node which can be traversed (parent, children)
         /// </summary>
         /// <param name="alias"></param>
         /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
         TemplateNode GetTemplateNode(string alias);
 
         /// <summary>
@@ -24,6 +30,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="anyNode"></param>
         /// <param name="alias"></param>
         /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
         TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
index 235c18a7a8..53e9954fd0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
@@ -67,7 +67,15 @@ namespace Umbraco.Core.Persistence.Repositories
 
         protected override ITemplate PerformGet(int id)
         {
-            return GetAll(new[] { id }).FirstOrDefault();
+            var sql = GetBaseQuery(false).Where<TemplateDto>(x => x.NodeId == id);
+            var result = Database.Fetch<TemplateDto, NodeDto>(sql).FirstOrDefault();
+            if (result == null) return null;
+
+            //look up the simple template definitions that have a master template assigned, this is used 
+            // later to populate the template item's properties
+            var childIds = GetAxisDefinitions(result).ToArray();
+
+            return MapFromDto(result, childIds);
         }
 
         protected override IEnumerable<ITemplate> PerformGetAll(params int[] ids)
@@ -89,20 +97,15 @@ namespace Umbraco.Core.Persistence.Repositories
 
             //look up the simple template definitions that have a master template assigned, this is used 
             // later to populate the template item's properties
-            var childIdsSql = new Sql()
-                .Select("nodeId,alias,parentID")
-                .From<TemplateDto>()
-                .InnerJoin<NodeDto>()
-                .On<TemplateDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .Where<NodeDto>(t => t.ParentId > 0);
-            var childIds = Database.Fetch<dynamic>(childIdsSql)
-                .Select(x => new UmbracoEntity
+            var childIds = (ids.Any()
+                ? GetAxisDefinitions(dtos.ToArray())
+                : dtos.Select(x => new UmbracoEntity
                 {
-                    Id = x.nodeId,
-                    ParentId = x.parentID,
-                    Name = x.alias
-                });
-
+                    Id = x.NodeId,
+                    ParentId = x.NodeDto.ParentId,
+                    Name = x.Alias
+                })).ToArray();
+            
             return dtos.Select(d => MapFromDto(d, childIds));
         }
 
@@ -118,19 +121,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
             //look up the simple template definitions that have a master template assigned, this is used 
             // later to populate the template item's properties
-            var childIdsSql = new Sql()
-                .Select("nodeId,alias,parentID")
-                .From<TemplateDto>()
-                .InnerJoin<NodeDto>()
-                .On<TemplateDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .Where<NodeDto>(t => t.ParentId > 0);
-            var childIds = Database.Fetch<dynamic>(childIdsSql)
-                .Select(x => new UmbracoEntity
-                {
-                    Id = x.nodeId,
-                    ParentId = x.parentID,
-                    Name = x.alias
-                });
+            var childIds = GetAxisDefinitions(dtos.ToArray()).ToArray();
 
             return dtos.Select(d => MapFromDto(d, childIds));
         }
@@ -143,9 +134,9 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             var sql = new Sql();
             sql.Select(isCount ? "COUNT(*)" : "*")
-                .From<TemplateDto>()
-                .InnerJoin<NodeDto>()
-                .On<TemplateDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .From<TemplateDto>(SqlSyntax)
+                .InnerJoin<NodeDto>(SqlSyntax)
+                .On<TemplateDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                 .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
             return sql;
         }
@@ -348,22 +339,52 @@ namespace Umbraco.Core.Persistence.Repositories
 
         #endregion
 
-        private ITemplate MapFromDto(TemplateDto dto, IEnumerable<IUmbracoEntity> childDefinitions)
+        private IEnumerable<IUmbracoEntity> GetAxisDefinitions(params TemplateDto[] templates)
+        {
+            //look up the simple template definitions that have a master template assigned, this is used 
+            // later to populate the template item's properties
+            var childIdsSql = new Sql()
+                .Select("nodeId,alias,parentID")
+                .From<TemplateDto>(SqlSyntax)
+                .InnerJoin<NodeDto>(SqlSyntax)
+                .On<TemplateDto, NodeDto>(SqlSyntax, dto => dto.NodeId, dto => dto.NodeId)
+                //lookup axis's
+                .Where("umbracoNode." + SqlSyntax.GetQuotedColumnName("id") + " IN (@parentIds) OR umbracoNode.parentID IN (@childIds)",
+                    new {parentIds = templates.Select(x => x.NodeDto.ParentId), childIds = templates.Select(x => x.NodeId)});            
+
+            var childIds = Database.Fetch<dynamic>(childIdsSql)
+                .Select(x => new UmbracoEntity
+                {
+                    Id = x.nodeId,
+                    ParentId = x.parentID,
+                    Name = x.alias
+                });
+            return childIds;
+        }
+
+        /// <summary>
+        /// Maps from a dto to an ITemplate
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="axisDefinitions">
+        /// This is a collection of template definitions ... either all templates, or the collection of child templates and it's parent template
+        /// </param>
+        /// <returns></returns>
+        private ITemplate MapFromDto(TemplateDto dto, IUmbracoEntity[] axisDefinitions)
         {
             string csViewName = string.Concat(dto.Alias, ".cshtml");
             string vbViewName = string.Concat(dto.Alias, ".vbhtml");
             string masterpageName = string.Concat(dto.Alias, ".master");
 
             var factory = new TemplateFactory();
-            var template = factory.BuildEntity(dto, childDefinitions);
+            var template = factory.BuildEntity(dto, axisDefinitions);
 
             if (dto.NodeDto.ParentId > 0)
             {
-                //TODO: Fix this n+1 query!
-                var masterTemplate = Get(dto.NodeDto.ParentId);
+                var masterTemplate = axisDefinitions.FirstOrDefault(x => x.Id == dto.NodeDto.ParentId);
                 if (masterTemplate != null)
                 {
-                    template.MasterTemplateAlias = masterTemplate.Alias;
+                    template.MasterTemplateAlias = masterTemplate.Name;
                     template.MasterTemplateId = new Lazy<int>(() => dto.NodeDto.ParentId);
                 }
             }
@@ -460,49 +481,105 @@ namespace Umbraco.Core.Persistence.Repositories
             if (dto == null)
                 return null;
 
-            return Get(dto.NodeId);
+            return MapFromDto(dto, GetAxisDefinitions(dto).ToArray());
         }
 
         public IEnumerable<ITemplate> GetAll(params string[] aliases)
         {
+            var sql = GetBaseQuery(false);
+
             if (aliases.Any())
             {
-                foreach (var id in aliases)
-                {
-                    yield return Get(id);
-                }
-            }
-            else
-            {
-                var nodeDtos = Database.Fetch<NodeDto>("WHERE nodeObjectType = @NodeObjectType", new { NodeObjectType = NodeObjectTypeId });
-                foreach (var nodeDto in nodeDtos)
-                {
-                    yield return Get(nodeDto.NodeId);
-                }
+                sql.Where("cmsTemplate.alias IN (@aliases)", new {aliases = aliases});
             }
 
+            var dtos = Database.Fetch<TemplateDto, NodeDto>(sql).ToArray();
+            var axisDefos = GetAxisDefinitions(dtos).ToArray();
+            return dtos.Select(x => MapFromDto(x, axisDefos));
         }
 
         public IEnumerable<ITemplate> GetChildren(int masterTemplateId)
         {
-            //TODO: Fix this N+1!
-
-            List<TemplateDto> found;
-            if (masterTemplateId == -1)
+            var sql = GetBaseQuery(false);         
+            if (masterTemplateId <= 0)
             {
-                var sql = GetBaseQuery(false).Where<NodeDto>(x => x.ParentId <= 0);
-                found = Database.Fetch<TemplateDto, NodeDto>(sql);
+                sql.Where<NodeDto>(x => x.ParentId <= 0);
             }
             else
             {
-                var sql = GetBaseQuery(false).Where<NodeDto>(x => x.ParentId == masterTemplateId);
-                found = Database.Fetch<TemplateDto, NodeDto>(sql);
+                sql.Where<NodeDto>(x => x.ParentId == masterTemplateId);
             }
 
-            foreach (var templateDto in found)
+            var dtos = Database.Fetch<TemplateDto, NodeDto>(sql).ToArray();
+            var axisDefos = GetAxisDefinitions(dtos).ToArray();
+            return dtos.Select(x => MapFromDto(x, axisDefos));
+        }
+
+        public IEnumerable<ITemplate> GetChildren(string alias)
+        {
+            var sql = GetBaseQuery(false);
+            if (alias.IsNullOrWhiteSpace())
             {
-                yield return Get(templateDto.NodeId);
+                sql.Where<NodeDto>(x => x.ParentId <= 0);
             }
+            else
+            {
+                //unfortunately SQLCE doesn't support scalar subqueries in the where clause, otherwise we could have done this
+                // in a single query, now we have to lookup the path to acheive the same thing
+                var parent = Database.ExecuteScalar<int?>(new Sql().Select("nodeId").From<TemplateDto>(SqlSyntax).Where<TemplateDto>(dto => dto.Alias == alias));
+                if (parent.HasValue == false) return Enumerable.Empty<ITemplate>();
+
+                sql.Where<NodeDto>(x => x.ParentId == parent.Value);
+            }
+
+            var dtos = Database.Fetch<TemplateDto, NodeDto>(sql).ToArray();
+            var axisDefos = GetAxisDefinitions(dtos).ToArray();
+            return dtos.Select(x => MapFromDto(x, axisDefos));
+        }
+
+        public IEnumerable<ITemplate> GetDescendants(int masterTemplateId)
+        {
+            var sql = GetBaseQuery(false);
+            if (masterTemplateId > 0)
+            {
+                //unfortunately SQLCE doesn't support scalar subqueries in the where clause, otherwise we could have done this
+                // in a single query, now we have to lookup the path to acheive the same thing
+                var path = Database.ExecuteScalar<string>(
+                    new Sql().Select(SqlSyntax.GetQuotedColumnName("path"))
+                        .From<TemplateDto>(SqlSyntax)
+                        .InnerJoin<NodeDto>(SqlSyntax)
+                        .On<TemplateDto, NodeDto>(SqlSyntax, dto => dto.NodeId, dto => dto.NodeId)
+                        .Where<NodeDto>(dto => dto.NodeId == masterTemplateId));
+
+                if (path.IsNullOrWhiteSpace()) return Enumerable.Empty<ITemplate>();
+
+                sql.Where(@"(umbracoNode." + SqlSyntax.GetQuotedColumnName("path") + @" LIKE @query)", new { query = path + ",%" });
+            }
+
+            var dtos = Database.Fetch<TemplateDto, NodeDto>(sql).ToArray();
+            var axisDefos = GetAxisDefinitions(dtos).ToArray();
+            return dtos.Select(x => MapFromDto(x, axisDefos));
+
+        }
+
+        public IEnumerable<ITemplate> GetDescendants(string alias)
+        {
+            var sql = GetBaseQuery(false);
+            if (alias.IsNullOrWhiteSpace() == false)
+            {
+                //unfortunately SQLCE doesn't support scalar subqueries in the where clause, otherwise we could have done this
+                // in a single query, now we have to lookup the path to acheive the same thing
+                var path = Database.ExecuteScalar<string>(
+                    "SELECT umbracoNode.path FROM cmsTemplate INNER JOIN umbracoNode ON cmsTemplate.nodeId = umbracoNode.id WHERE cmsTemplate.alias = @alias", new { alias = alias });
+
+                if (path.IsNullOrWhiteSpace()) return Enumerable.Empty<ITemplate>();
+
+                sql.Where(@"(umbracoNode." + SqlSyntax.GetQuotedColumnName("path") + @" LIKE @query)", new {query = path + ",%" });
+            }
+
+            var dtos = Database.Fetch<TemplateDto, NodeDto>(sql).ToArray();
+            var axisDefos = GetAxisDefinitions(dtos).ToArray();
+            return dtos.Select(x => MapFromDto(x, axisDefos));
         }
 
         /// <summary>
@@ -510,13 +587,9 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         /// <param name="alias"></param>
         /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
         public TemplateNode GetTemplateNode(string alias)
-        {
-            //in order to do this we need to get all of the templates and then organize, 
-            // TODO: unfortunately our db structure does not use the path correctly for templates so we cannot just look
-            // up a template tree easily.
-            //TODO: We do use the 'path' now, so this might be able to be fixed up 
-
+        {            
             //first get all template objects
             var allTemplates = GetAll().ToArray();
 
@@ -525,23 +598,17 @@ namespace Umbraco.Core.Persistence.Repositories
             {
                 return null;
             }
-
-            //then we need to get all template Dto's because those contain the master property
-            var sql = GetBaseQuery(false);
-            var allDtos = Database.Fetch<TemplateDto, NodeDto>(sql).ToArray();
-            var selfDto = allDtos.Single(x => x.NodeId == selfTemplate.Id);
-
-            //need to get the top-most node of the current tree
-            var top = selfDto;
-            while (top.NodeDto.ParentId > 0)
+            
+            var top = selfTemplate;
+            while (top.MasterTemplateAlias.IsNullOrWhiteSpace() == false)
             {
-                top = allDtos.Single(x => x.NodeId == top.NodeDto.ParentId);
+                top = allTemplates.Single(x => x.Alias == top.MasterTemplateAlias);
             }
 
-            var topNode = new TemplateNode(allTemplates.Single(x => x.Id == top.NodeId));
-            var childIds = allDtos.Where(x => x.NodeDto.ParentId == top.NodeId).Select(x => x.NodeId);
+            var topNode = new TemplateNode(allTemplates.Single(x => x.Id == top.Id));
+            var childTemplates = allTemplates.Where(x => x.MasterTemplateAlias == top.Alias);
             //This now creates the hierarchy recursively
-            topNode.Children = CreateChildren(topNode, childIds, allTemplates, allDtos);
+            topNode.Children = CreateChildren(topNode, childTemplates, allTemplates);
 
             //now we'll return the TemplateNode requested
             return FindTemplateInTree(topNode, alias);
@@ -568,6 +635,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="anyNode"></param>
         /// <param name="alias"></param>
         /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
         public TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias)
         {
             //first get the root
@@ -658,12 +726,12 @@ namespace Umbraco.Core.Persistence.Repositories
             return validFile && validExtension;
         }
 
-        private static IEnumerable<TemplateNode> CreateChildren(TemplateNode parent, IEnumerable<int> childIds, ITemplate[] allTemplates, TemplateDto[] allDtos)
+        private static IEnumerable<TemplateNode> CreateChildren(TemplateNode parent, IEnumerable<ITemplate> childTemplates, ITemplate[] allTemplates)
         {
             var children = new List<TemplateNode>();
-            foreach (var i in childIds)
+            foreach (var childTemplate in childTemplates)
             {
-                var template = allTemplates.Single(x => x.Id == i);
+                var template = allTemplates.Single(x => x.Id == childTemplate.Id);
                 var child = new TemplateNode(template)
                     {
                         Parent = parent
@@ -673,10 +741,11 @@ namespace Umbraco.Core.Persistence.Repositories
                 children.Add(child);
 
                 //get this node's children
-                var kids = allDtos.Where(x => x.NodeDto.ParentId == i).Select(x => x.NodeId).ToArray();
+                var local = childTemplate;
+                var kids = allTemplates.Where(x => x.MasterTemplateAlias == local.Alias);
 
                 //recurse
-                child.Children = CreateChildren(child, kids, allTemplates, allDtos);
+                child.Children = CreateChildren(child, kids, allTemplates);
             }
             return children;
         }
diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index 29ccfbf6bf..4dcbd5bdc8 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -319,6 +319,53 @@ namespace Umbraco.Core.Services
             }
         }
 
+        public IEnumerable<ITemplate> GetTemplateDescendants(string alias)
+        {
+            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            {
+                return repository.GetDescendants(alias);
+            }
+        }
+
+        /// <summary>
+        /// Gets the template descendants
+        /// </summary>
+        /// <param name="masterTemplateId"></param>
+        /// <returns></returns>
+        public IEnumerable<ITemplate> GetTemplateDescendants(int masterTemplateId)
+        {
+            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            {
+                return repository.GetDescendants(masterTemplateId);
+            }
+        }
+
+        /// <summary>
+        /// Gets the template children
+        /// </summary>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        public IEnumerable<ITemplate> GetTemplateChildren(string alias)
+        {
+            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            {
+                return repository.GetChildren(alias);
+            }
+        }
+
+        /// <summary>
+        /// Gets the template children
+        /// </summary>
+        /// <param name="masterTemplateId"></param>
+        /// <returns></returns>
+        public IEnumerable<ITemplate> GetTemplateChildren(int masterTemplateId)
+        {
+            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            {
+                return repository.GetChildren(masterTemplateId);
+            }
+        }
+
         /// <summary>
         /// Returns a template as a template node which can be traversed (parent, children)
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index 7803abe98e..e1c0f1428c 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -130,10 +130,38 @@ namespace Umbraco.Core.Services
         ITemplate GetTemplate(int id);
 
         /// <summary>
-        /// Returns a template as a template node which can be traversed (parent, children)
+        /// Gets the template descendants
         /// </summary>
         /// <param name="alias"></param>
         /// <returns></returns>
+        IEnumerable<ITemplate> GetTemplateDescendants(string alias);
+
+        /// <summary>
+        /// Gets the template descendants
+        /// </summary>
+        /// <param name="masterTemplateId"></param>
+        /// <returns></returns>
+        IEnumerable<ITemplate> GetTemplateDescendants(int masterTemplateId);
+
+        /// <summary>
+        /// Gets the template children
+        /// </summary>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        IEnumerable<ITemplate> GetTemplateChildren(string alias);
+
+        /// <summary>
+        /// Gets the template children
+        /// </summary>
+        /// <param name="masterTemplateId"></param>
+        /// <returns></returns>
+        IEnumerable<ITemplate> GetTemplateChildren(int masterTemplateId);
+
+        /// <summary>
+        /// Returns a template as a template node which can be traversed (parent, children)
+        /// </summary>
+        /// <param name="alias"></param>
+        /// <returns></returns>        
         TemplateNode GetTemplateNode(string alias);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b13529f8ea..56935ed7f7 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -37,13 +37,13 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -1387,7 +1387,6 @@
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
     <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 1c1afc4d9c..56ad180bfd 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net4" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
index fb76f4402b..4fae9938cb 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -489,77 +490,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var unitOfWork = provider.GetUnitOfWork();
             using (var repository = CreateRepository(unitOfWork))
             {
-                var parent = new Template("parent", "parent")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-
-                var child1 = new Template("child1", "child1")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var toddler1 = new Template("toddler1", "toddler1")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var toddler2 = new Template("toddler2", "toddler2")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var baby1 = new Template("baby1", "baby1")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-
-                var child2 = new Template("child2", "child2")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var toddler3 = new Template("toddler3", "toddler3")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var toddler4 = new Template("toddler4", "toddler4")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var baby2 = new Template("baby2", "baby2")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-
-
-                child1.MasterTemplateAlias = parent.Alias;
-                child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
-                child2.MasterTemplateAlias = parent.Alias;
-                child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
-
-                toddler1.MasterTemplateAlias = child1.Alias;
-                toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
-                toddler2.MasterTemplateAlias = child1.Alias;
-                toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
-
-                toddler3.MasterTemplateAlias = child2.Alias;
-                toddler3.MasterTemplateId = new Lazy<int>(() => child2.Id);
-                toddler4.MasterTemplateAlias = child2.Alias;
-                toddler4.MasterTemplateId = new Lazy<int>(() => child2.Id);
-
-                baby1.MasterTemplateAlias = toddler2.Alias;
-                baby1.MasterTemplateId = new Lazy<int>(() => toddler2.Id);
-
-                baby2.MasterTemplateAlias = toddler4.Alias;
-                baby2.MasterTemplateId = new Lazy<int>(() => toddler4.Id);
-
-                repository.AddOrUpdate(parent);
-                repository.AddOrUpdate(child1);
-                repository.AddOrUpdate(child2);
-                repository.AddOrUpdate(toddler1);
-                repository.AddOrUpdate(toddler2);
-                repository.AddOrUpdate(toddler3);
-                repository.AddOrUpdate(toddler4);
-                repository.AddOrUpdate(baby1);
-                repository.AddOrUpdate(baby2);
-                unitOfWork.Commit();
+                CreateHierarchy(repository, unitOfWork);
 
                 // Act
                 var rootNode = repository.GetTemplateNode("parent");
@@ -575,8 +506,102 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.IsNotNull(repository.FindTemplateInTree(rootNode, "baby1"));
                 Assert.IsNotNull(repository.FindTemplateInTree(rootNode, "baby2"));
             }
+        }
+
+        [Test]
+        public void Can_Get_All()
+        {
+            // Arrange
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            using (var repository = CreateRepository(unitOfWork))
+            {
+                var created = CreateHierarchy(repository, unitOfWork).ToArray();
+
+                // Act
+                var all = repository.GetAll();
+                var allByAlias = repository.GetAll("parent", "child2", "baby2", "notFound");
+                var allById = repository.GetAll(created[0].Id, created[2].Id, created[4].Id, created[5].Id, 999999);
+
+                // Assert
+                Assert.AreEqual(9, all.Count());
+                Assert.AreEqual(9, all.DistinctBy(x => x.Id).Count());
+
+                Assert.AreEqual(3, allByAlias.Count());
+                Assert.AreEqual(3, allByAlias.DistinctBy(x => x.Id).Count());
+
+                Assert.AreEqual(4, allById.Count());
+                Assert.AreEqual(4, allById.DistinctBy(x => x.Id).Count());
+            }
+        }
+
+        [Test]
+        public void Can_Get_Children()
+        {
+            // Arrange
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            using (var repository = CreateRepository(unitOfWork))
+            {
+                var created = CreateHierarchy(repository, unitOfWork).ToArray();
+
+                // Act
+                var childrenById = repository.GetChildren(created[1].Id);
+                var childrenByAlias = repository.GetChildren(created[1].Alias);
 
 
+                // Assert
+                Assert.AreEqual(2, childrenById.Count());
+                Assert.AreEqual(2, childrenById.DistinctBy(x => x.Id).Count());
+                Assert.AreEqual(2, childrenByAlias.Count());
+                Assert.AreEqual(2, childrenByAlias.DistinctBy(x => x.Id).Count());
+
+            }
+        }
+
+        [Test]
+        public void Can_Get_Children_At_Root()
+        {
+            // Arrange
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            using (var repository = CreateRepository(unitOfWork))
+            {
+                CreateHierarchy(repository, unitOfWork).ToArray();
+
+                // Act
+                var children = repository.GetChildren(-1);
+
+
+                // Assert
+                Assert.AreEqual(1, children.Count());
+                Assert.AreEqual(1, children.DistinctBy(x => x.Id).Count());
+
+            }
+        }
+
+        [Test]
+        public void Can_Get_Descendants()
+        {
+            // Arrange
+            var provider = new PetaPocoUnitOfWorkProvider(Logger);
+            var unitOfWork = provider.GetUnitOfWork();
+            using (var repository = CreateRepository(unitOfWork))
+            {
+                var created = CreateHierarchy(repository, unitOfWork).ToArray();
+
+                // Act
+                var descendantsById = repository.GetDescendants(created[1].Id);
+                var descendantsByAlias = repository.GetDescendants(created[1].Alias);
+
+
+                // Assert
+                Assert.AreEqual(3, descendantsById.Count());
+                Assert.AreEqual(3, descendantsById.DistinctBy(x => x.Id).Count());
+
+                Assert.AreEqual(3, descendantsByAlias.Count());
+                Assert.AreEqual(3, descendantsByAlias.DistinctBy(x => x.Id).Count());
+            }
         }
 
         [Test]
@@ -717,5 +742,82 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             return stream;
         }
+
+        private IEnumerable<ITemplate> CreateHierarchy(ITemplateRepository repository, IDatabaseUnitOfWork unitOfWork)
+        {
+            var parent = new Template("parent", "parent")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+
+            var child1 = new Template("child1", "child1")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+            var toddler1 = new Template("toddler1", "toddler1")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+            var toddler2 = new Template("toddler2", "toddler2")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+            var baby1 = new Template("baby1", "baby1")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+
+            var child2 = new Template("child2", "child2")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+            var toddler3 = new Template("toddler3", "toddler3")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+            var toddler4 = new Template("toddler4", "toddler4")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+            var baby2 = new Template("baby2", "baby2")
+            {
+                Content = @"<%@ Master Language=""C#"" %>"
+            };
+
+
+            child1.MasterTemplateAlias = parent.Alias;
+            child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
+            child2.MasterTemplateAlias = parent.Alias;
+            child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
+
+            toddler1.MasterTemplateAlias = child1.Alias;
+            toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
+            toddler2.MasterTemplateAlias = child1.Alias;
+            toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
+
+            toddler3.MasterTemplateAlias = child2.Alias;
+            toddler3.MasterTemplateId = new Lazy<int>(() => child2.Id);
+            toddler4.MasterTemplateAlias = child2.Alias;
+            toddler4.MasterTemplateId = new Lazy<int>(() => child2.Id);
+
+            baby1.MasterTemplateAlias = toddler2.Alias;
+            baby1.MasterTemplateId = new Lazy<int>(() => toddler2.Id);
+
+            baby2.MasterTemplateAlias = toddler4.Alias;
+            baby2.MasterTemplateId = new Lazy<int>(() => toddler4.Id);
+
+            repository.AddOrUpdate(parent);
+            repository.AddOrUpdate(child1);
+            repository.AddOrUpdate(child2);
+            repository.AddOrUpdate(toddler1);
+            repository.AddOrUpdate(toddler2);
+            repository.AddOrUpdate(toddler3);
+            repository.AddOrUpdate(toddler4);
+            repository.AddOrUpdate(baby1);
+            repository.AddOrUpdate(baby2);
+            unitOfWork.Commit();
+
+            return new[] {parent, child1, child2, toddler1, toddler2, toddler3, toddler4, baby1, baby2};
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
index ea6e096fbf..0b616af276 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Tests.Routing
 		{
 		    SetupDomainServiceMock(new[]
 		    {
-		        new UmbracoDomain("domain1.com/") {Id = 1, LanguageId = LangDeId, RootContentId = 1001}
+		        new UmbracoDomain("domain1.com/") {Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE"}
 		    });
 
 		}
@@ -22,12 +22,12 @@ namespace Umbraco.Tests.Routing
 		{
 		    SetupDomainServiceMock(new[]
 		    {
-		        new UmbracoDomain("domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001},
-		        new UmbracoDomain("domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011},
-		        new UmbracoDomain("domain1.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId =  10012},
-		        new UmbracoDomain("http://domain3.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1003},
-		        new UmbracoDomain("http://domain3.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10031},
-		        new UmbracoDomain("http://domain3.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10032}
+		        new UmbracoDomain("domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US"},
+		        new UmbracoDomain("domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
+		        new UmbracoDomain("domain1.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId =  10012, LanguageIsoCode = "fr-FR"},
+		        new UmbracoDomain("http://domain3.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1003, LanguageIsoCode = "en-US"},
+		        new UmbracoDomain("http://domain3.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US"},
+		        new UmbracoDomain("http://domain3.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR"}
 		    });
 
 		}
diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
index 6af00d6127..b0f4791c84 100644
--- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
+++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
@@ -30,19 +30,22 @@ namespace Umbraco.Tests.Routing
                 {
                     Id = 1,
                     LanguageId = LangDeId,
-                    RootContentId = 1001
+                    RootContentId = 1001,
+                    LanguageIsoCode = "de-DE"
                 },
                 new UmbracoDomain("domain1.com/en")
                 {
                     Id = 1,
                     LanguageId = LangEngId,
-                    RootContentId = 10011
+                    RootContentId = 10011,
+                    LanguageIsoCode = "en-US"
                 },
                 new UmbracoDomain("domain1.com/fr")
                 {
                     Id = 1,
                     LanguageId = LangFrId,
-                    RootContentId = 10012
+                    RootContentId = 10012,
+                    LanguageIsoCode = "fr-FR"
                 }
             });
         }
@@ -55,55 +58,64 @@ namespace Umbraco.Tests.Routing
                 {
                     Id = 1,
                     LanguageId = LangDeId,
-                    RootContentId = 1001
+                    RootContentId = 1001,
+                    LanguageIsoCode = "de-DE"
                 },
                 new UmbracoDomain("domain1.com/en")
                 {
                     Id = 1,
                     LanguageId = LangEngId,
-                    RootContentId = 10011
+                    RootContentId = 10011,
+                    LanguageIsoCode = "en-US"
                 },
                 new UmbracoDomain("domain1.com/fr")
                 {
                     Id = 1,
                     LanguageId = LangFrId,
-                    RootContentId = 10012
+                    RootContentId = 10012,
+                    LanguageIsoCode = "fr-FR"
                 },
                 new UmbracoDomain("*1001")
                 {
                     Id = 1,
                     LanguageId = LangDeId,
-                    RootContentId = 1001
+                    RootContentId = 1001,
+                    LanguageIsoCode = "de-DE"
                 },
                 new UmbracoDomain("*10011")
                 {
                     Id = 1,
                     LanguageId = LangCzId,
-                    RootContentId = 10011
+                    RootContentId = 10011,
+                    LanguageIsoCode = "cs-CZ"
                 },
                 new UmbracoDomain("*100112")
                 {
                     Id = 1,
                     LanguageId = LangNlId,
-                    RootContentId = 100112
+                    RootContentId = 100112,
+                    LanguageIsoCode = "nl-NL"
                 },
                 new UmbracoDomain("*1001122")
                 {
                     Id = 1,
                     LanguageId = LangDkId,
-                    RootContentId = 1001122
+                    RootContentId = 1001122,
+                    LanguageIsoCode = "da-DK"
                 },
                 new UmbracoDomain("*10012")
                 {
                     Id = 1,
                     LanguageId = LangNlId,
-                    RootContentId = 10012
+                    RootContentId = 10012,
+                    LanguageIsoCode = "nl-NL"
                 },
                 new UmbracoDomain("*10031")
                 {
                     Id = 1,
                     LanguageId = LangNlId,
-                    RootContentId =10031
+                    RootContentId =10031,
+                    LanguageIsoCode = "nl-NL"
                 }
             });
         }
@@ -343,19 +355,22 @@ namespace Umbraco.Tests.Routing
                 {
                     Id = 1,
                     LanguageId = LangEngId,
-                    RootContentId = 1001
+                    RootContentId = 1001,
+                    LanguageIsoCode = "en-US"
                 },
                 new UmbracoDomain("domain1.fr/")
                 {
                     Id = 1,
                     LanguageId = LangFrId,
-                    RootContentId = 1001
+                    RootContentId = 1001,
+                    LanguageIsoCode = "fr-FR"
                 },
                 new UmbracoDomain("*100112")
                 {
                     Id = 1,
                     LanguageId = LangDeId,
-                    RootContentId = 100112
+                    RootContentId = 100112,
+                    LanguageIsoCode = "de-DE"
                 }
             });
 
diff --git a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
index ffbed3e2f4..8cc975954b 100644
--- a/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/NiceUrlsProviderWithDomainsTests.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Tests.Routing
 
             SetupDomainServiceMock(new[]
 		    {
-		        new UmbracoDomain("domain1.com") {Id = 1, LanguageId = LangFrId, RootContentId = 1001}
+		        new UmbracoDomain("domain1.com") {Id = 1, LanguageId = LangFrId, RootContentId = 1001, LanguageIsoCode = "fr-FR"}
 		    });
         }
 
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain("http://domain1.com/foo") {Id = 1, LanguageId = LangFrId, RootContentId = 1001}
+                new UmbracoDomain("http://domain1.com/foo") {Id = 1, LanguageId = LangFrId, RootContentId = 1001, LanguageIsoCode = "fr-FR"}
             });
         }
 
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangFrId, RootContentId = 10011}
+                new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangFrId, RootContentId = 10011, LanguageIsoCode = "fr-FR"}
             });
         }
 
@@ -52,12 +52,12 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001},
-                new UmbracoDomain("http://domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011},
-                new UmbracoDomain("http://domain1.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012},
-                new UmbracoDomain("http://domain3.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1003},
-                new UmbracoDomain("http://domain3.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10031},
-                new UmbracoDomain("http://domain3.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10032}
+                new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain1.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
+                new UmbracoDomain("http://domain3.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1003, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain3.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain3.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR"}
             });
         }
 
@@ -65,14 +65,14 @@ namespace Umbraco.Tests.Routing
         {
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain("http://domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011},
-                new UmbracoDomain("http://domain1a.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011},
-                new UmbracoDomain("http://domain1b.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011},
-                new UmbracoDomain("http://domain1.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012},
-                new UmbracoDomain("http://domain1a.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012},
-                new UmbracoDomain("http://domain1b.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012},
-                new UmbracoDomain("http://domain3.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10031},
-                new UmbracoDomain("http://domain3.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10032}
+                new UmbracoDomain("http://domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain1a.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain1b.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain1.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
+                new UmbracoDomain("http://domain1a.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
+                new UmbracoDomain("http://domain1b.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
+                new UmbracoDomain("http://domain3.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain3.com/fr") {Id = 1, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR"}
             });
         }
 
diff --git a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
index 643d007889..475909318a 100644
--- a/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
+++ b/src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
@@ -42,19 +42,10 @@ namespace Umbraco.Tests.Routing
             domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
                 .Returns((bool incWildcards) => new[]
                 {
-                    new UmbracoDomain("domain1.com/"){Id = 1, LanguageId = 333, RootContentId = 1001}, 
-                    new UmbracoDomain("domain1.com/en"){Id = 1, LanguageId = 334, RootContentId = 10011}, 
-                    new UmbracoDomain("domain1.com/fr"){Id = 1, LanguageId = 335, RootContentId = 10012}
-                });
-
-            var langService = Mock.Get(svcCtx.LocalizationService);
-            //setup mock domain service
-            langService.Setup(service => service.GetLanguageById(LangDeId)).Returns(new Language("de-DE") {Id = LangDeId });
-            langService.Setup(service => service.GetLanguageById(LangEngId)).Returns(new Language("en-US") { Id = LangEngId });
-            langService.Setup(service => service.GetLanguageById(LangFrId)).Returns(new Language("fr-FR") { Id = LangFrId });
-            langService.Setup(service => service.GetLanguageById(LangCzId)).Returns(new Language("cs-CZ") { Id = LangCzId });
-            langService.Setup(service => service.GetLanguageById(LangNlId)).Returns(new Language("nl-NL") { Id = LangNlId });
-            langService.Setup(service => service.GetLanguageById(LangDkId)).Returns(new Language("da-DK") { Id = LangDkId });
+                    new UmbracoDomain("domain1.com/"){Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE"}, 
+                    new UmbracoDomain("domain1.com/en"){Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"}, 
+                    new UmbracoDomain("domain1.com/fr"){Id = 1, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"}
+                });            
 
             return svcCtx;
         }
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 79feac0b28..2e868f9f44 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -80,8 +80,8 @@ namespace Umbraco.Tests.Routing
 		{
             SetupDomainServiceMock(new[]
             {
-                new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001},
-                new UmbracoDomain("http://domain2.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 10011}
+                new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US"},
+                new UmbracoDomain("http://domain2.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"}
             });
 
 		}
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 30433ed00b..950f7b6aeb 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -51,13 +51,13 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Examine, Version=0.1.66.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Examine.0.1.66.0\lib\Examine.dll</HintPath>
@@ -731,7 +731,6 @@
 xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" /Y /F /E /D</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Umbraco.Tests/packages.config b/src/Umbraco.Tests/packages.config
index 4ed8172598..68c7fcd5b0 100644
--- a/src/Umbraco.Tests/packages.config
+++ b/src/Umbraco.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
-  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
   <package id="Examine" version="0.1.66.0" targetFramework="net45" />
   <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8f0393994b..e12df98d43 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -107,13 +107,13 @@
       <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
       <Name>UmbracoExamine</Name>
     </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency.1.8.4\lib\net45\ClientDependency.Core.dll</HintPath>
@@ -2456,5 +2456,4 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
     <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 456473e07d..4ae3d478e7 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 --> 
-<clientDependency version="51624844" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1562618785" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index 90de4110b9..17c9513672 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -10,7 +10,6 @@
       </control>
     </tab>
   </section>
-  
   <section alias="StartupFormsDashboardSection">
     <areas>
       <area>forms</area>
@@ -21,7 +20,6 @@
       </control>
     </tab>
   </section>
-
   <section alias="StartupDeveloperDashboardSection">
     <areas>
       <area>developer</area>
@@ -52,7 +50,6 @@
       </control>
     </tab>
   </section>
-  
   <section alias="StartupFormsDashboardSection">
     <areas>
       <area>forms</area>
@@ -63,7 +60,6 @@
       </control>
     </tab>
   </section>
-  
   <section alias="StartupDashboardSection">
     <access>
       <deny>translator</deny>
@@ -103,4 +99,14 @@
       <control>/umbraco/plugins/umbracocontour/formsdashboard.ascx</control>
     </tab>
   </section>
+  <section alias="ArticulateImportDashboard">
+    <areas>
+      <area>developer</area>
+    </areas>
+    <tab caption="Articulate Importer">
+      <control showOnce="false" addPanel="true" panelCaption="">
+              ~/App_Plugins/Articulate/BackOffice/Dashboards/BlogImporter.html
+            </control>
+    </tab>
+  </section>
 </dashBoard>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 5727d63669..4733400005 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
   <package id="ClientDependency" version="1.8.4" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
   <package id="dotless" version="1.4.1.0" targetFramework="net45" />
diff --git a/src/Umbraco.Web/Models/ContentExtensions.cs b/src/Umbraco.Web/Models/ContentExtensions.cs
index ef5161ec9d..37fe9151b0 100644
--- a/src/Umbraco.Web/Models/ContentExtensions.cs
+++ b/src/Umbraco.Web/Models/ContentExtensions.cs
@@ -80,25 +80,14 @@ namespace Umbraco.Web.Models
                     : domainHelper.DomainForNode(int.Parse(route.Substring(0, pos)), current).UmbracoDomain;
               }
 
-            if (domain == null)
+            if (domain == null || domain.LanguageIsoCode.IsNullOrWhiteSpace())
                 return GetDefaultCulture(localizationService);
 
-            //NOTE: The domain service IDomain model has changed and no longer holds a reference to IContent or ILanguage to 
-            // improve performance, this means that we need to lookup the language  below, but this was already the case previously
-            // in the repository and since the language lookup is cached it should be ok. If we want however we could create
-            // another method on the DomainService to return domains with their culture info on them
             var wcDomain = DomainHelper.FindWildcardDomainInPath(domainService.GetAll(true), contentPath, domain.RootContentId);
-            if (wcDomain != null && wcDomain.LanguageIsoCode.IsNullOrWhiteSpace() == false)
-            {                
-                return new CultureInfo(wcDomain.LanguageIsoCode);
-            }
 
-            if (domain.LanguageIsoCode.IsNullOrWhiteSpace() == false)
-            {
-                return new CultureInfo(domain.LanguageIsoCode);
-            }
-
-            return GetDefaultCulture(localizationService);
+            return wcDomain == null
+                ? new CultureInfo(domain.LanguageIsoCode)
+                : new CultureInfo(wcDomain.LanguageIsoCode);
         }
 
         private static CultureInfo GetDefaultCulture(ILocalizationService localizationService)
diff --git a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs b/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
index aae16b5fa9..22c4364891 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
@@ -28,8 +28,7 @@ namespace Umbraco.Web.Routing
 		        pcr.RoutingContext.UmbracoContext.HttpContext.Request.ServerVariables["SERVER_NAME"],
                 pcr.RoutingContext.UmbracoContext.Application.Services.EntityService,
                 new PublishedContentQuery(pcr.RoutingContext.UmbracoContext.ContentCache, pcr.RoutingContext.UmbracoContext.MediaCache),
-                pcr.RoutingContext.UmbracoContext.Application.Services.DomainService,
-                pcr.RoutingContext.UmbracoContext.Application.Services.LocalizationService);
+                pcr.RoutingContext.UmbracoContext.Application.Services.DomainService);
 
 			IPublishedContent content = null;
 
diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
index 798efc674d..50497ba032 100644
--- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
+++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
@@ -230,15 +230,13 @@ namespace Umbraco.Web.Routing
         /// <param name="entityService"></param>
         /// <param name="publishedContentQuery"></param>
         /// <param name="domainService"></param>
-        /// <param name="localizationService"></param>
         /// <returns></returns>
         internal static int? GetCurrentNotFoundPageId(
             IContentErrorPage[] error404Collection, 
             string requestServerName, 
             IEntityService entityService,
             ITypedPublishedContentQuery publishedContentQuery,
-            IDomainService domainService,
-            ILocalizationService localizationService)
+            IDomainService domainService)
         {
             if (error404Collection.Count() > 1)
             {
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 31ebe06918..ff1016cfe7 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -97,13 +97,13 @@
       <Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
       <Name>UmbracoExamine</Name>
     </ProjectReference>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ClientDependency.1.8.4\lib\net45\ClientDependency.Core.dll</HintPath>
@@ -2245,5 +2245,4 @@
     <!--<PostBuildEvent>xcopy "$(ProjectDir)..\..\lib\*.dll" "$(TargetDir)*.dll" /Y</PostBuildEvent>-->
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 37de741007..0f6fc03b80 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -30,9 +30,13 @@ namespace Umbraco.Web
 	        base.OnApplicationStarted(sender, e);
 
 	        if (ApplicationContext.Current.IsConfigured && GlobalSettings.DebugMode)
-	        {   
-                _mw = new ManifestWatcher(LoggerResolver.Current.Logger);
-	            _mw.Start(Directory.GetDirectories(IOHelper.MapPath("~/App_Plugins/")));
+	        {                   
+	            var appPluginFolder = IOHelper.MapPath("~/App_Plugins/");
+	            if (Directory.Exists(appPluginFolder))
+	            {
+                    _mw = new ManifestWatcher(LoggerResolver.Current.Logger);
+                    _mw.Start(Directory.GetDirectories(IOHelper.MapPath("~/App_Plugins/")));
+                }
 	        }
 	    }
 
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index 6cdd67fe04..f3ecf6b064 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
   <package id="ClientDependency" version="1.8.4" targetFramework="net45" />
   <package id="dotless" version="1.4.1.0" targetFramework="net45" />
   <package id="Examine" version="0.1.66.0" targetFramework="net45" />
diff --git a/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs b/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
index 6854bb9a4d..27e62888d4 100644
--- a/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
+++ b/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
@@ -326,8 +326,7 @@ namespace umbraco {
 			        HttpContext.Current.Request.ServerVariables["SERVER_NAME"],
 			        ApplicationContext.Current.Services.EntityService,
 			        new PublishedContentQuery(UmbracoContext.Current.ContentCache, UmbracoContext.Current.MediaCache),
-                    ApplicationContext.Current.Services.DomainService,
-                    ApplicationContext.Current.Services.LocalizationService);
+                    ApplicationContext.Current.Services.DomainService);
 
 			    if (error404.HasValue)
 			    {
diff --git a/src/umbraco.businesslogic/packages.config b/src/umbraco.businesslogic/packages.config
index 65ef682839..4a0a1d249b 100644
--- a/src/umbraco.businesslogic/packages.config
+++ b/src/umbraco.businesslogic/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
diff --git a/src/umbraco.businesslogic/umbraco.businesslogic.csproj b/src/umbraco.businesslogic/umbraco.businesslogic.csproj
index c34a55d08b..e134c33eab 100644
--- a/src/umbraco.businesslogic/umbraco.businesslogic.csproj
+++ b/src/umbraco.businesslogic/umbraco.businesslogic.csproj
@@ -106,13 +106,13 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
+    <Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
+    <Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -295,5 +295,4 @@
     </PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
 </Project>
\ No newline at end of file