diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index ff4b07e10..1fc26a0e5 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -256,6 +256,10 @@
       <Project>{D10AD48F-407D-4DB5-A328-173EC7CB010F}</Project>
       <Name>Orchard.Roles</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Scripting.Dlr\Orchard.Scripting.Dlr.csproj">
+      <Project>{2AD6973D-C7BB-416E-89FE-EEE34664E05F}</Project>
+      <Name>Orchard.Scripting.Dlr</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Orchard.Web\Modules\Orchard.Scripting\Orchard.Scripting.csproj">
       <Project>{2AD6973D-C7BB-416E-89FE-EEE34664E05F}</Project>
       <Name>Orchard.Scripting</Name>
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.Debug.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.Debug.config
index 3a38cc0c5..a8eacfd77 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.Debug.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.Debug.config
@@ -1,9 +1,5 @@
 <?xml version="1.0"?>
 
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!-- system.web>
-    <machineKey xdt:Transform="Remove" />
-    <machineKey xdt:Transform="Insert" validationKey="AutoGenerate" decryptionKey="AutoGenerate" validation="SHA1" decryption="AES" />
-  </system.web -->
   <system.web.extensions xdt:Transform="Remove" />
 </configuration>
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.Release.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.Release.config
index 3a38cc0c5..a8eacfd77 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.Release.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.Release.config
@@ -1,9 +1,5 @@
 <?xml version="1.0"?>
 
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!-- system.web>
-    <machineKey xdt:Transform="Remove" />
-    <machineKey xdt:Transform="Insert" validationKey="AutoGenerate" decryptionKey="AutoGenerate" validation="SHA1" decryption="AES" />
-  </system.web -->
   <system.web.extensions xdt:Transform="Remove" />
 </configuration>
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.config
index 5e78c822b..f84174283 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config
@@ -40,7 +40,6 @@
     <defaultSettings timeout="00:30:00"/>
   </system.transactions>
   <system.web>
-    <machineKey validationKey="013B82F217ABB7EAB1F699E4E5B4D290030644D435994692354DAE82B06568B058BFE3C57BF199A41FFDBC84F3BC74D9C5BD96D1265F36A22D58347B591AC8DD" decryptionKey="04797035C490263D73ED991C84C5DFCD0D0206AD4F12BC3638A38FBEABEBB8C7" validation="SHA1" decryption="AES" />
 
     <httpRuntime requestValidationMode="2.0" />
     <!-- 
diff --git a/src/Orchard.Azure/Orchard.Azure.sln b/src/Orchard.Azure/Orchard.Azure.sln
index 2ca8f8e3e..cd5fcf02e 100644
--- a/src/Orchard.Azure/Orchard.Azure.sln
+++ b/src/Orchard.Azure/Orchard.Azure.sln
@@ -77,7 +77,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Pages", "..\Orchard
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.PublishLater", "..\Orchard.Web\Modules\Orchard.PublishLater\Orchard.PublishLater.csproj", "{C889167C-E52C-4A65-A419-224B3D1B957D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Scripting", "..\Orchard.Web\Modules\Orchard.Scripting\Orchard.Scripting.csproj", "{2AD6973D-C7BB-416E-89FE-EEE34664E05F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Scripting", "..\Orchard.Web\Modules\Orchard.Scripting\Orchard.Scripting.csproj", "{99002B65-86F7-415E-BF4A-381AA8AB9CCC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Scripting.Dlr", "..\Orchard.Web\Modules\Orchard.Scripting.Dlr\Orchard.Scripting.Dlr.csproj", "{2AD6973D-C7BB-416E-89FE-EEE34664E05F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -225,6 +227,10 @@ Global
 		{C889167C-E52C-4A65-A419-224B3D1B957D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C889167C-E52C-4A65-A419-224B3D1B957D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C889167C-E52C-4A65-A419-224B3D1B957D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99002B65-86F7-415E-BF4A-381AA8AB9CCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99002B65-86F7-415E-BF4A-381AA8AB9CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99002B65-86F7-415E-BF4A-381AA8AB9CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99002B65-86F7-415E-BF4A-381AA8AB9CCC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2AD6973D-C7BB-416E-89FE-EEE34664E05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2AD6973D-C7BB-416E-89FE-EEE34664E05F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2AD6973D-C7BB-416E-89FE-EEE34664E05F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -262,6 +268,7 @@ Global
 		{085948FF-0E9B-4A9A-B564-F8B8B4BDDDBC} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{3420C92A-747F-4990-BA08-F2C9531E44AD} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{C889167C-E52C-4A65-A419-224B3D1B957D} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
+		{99002B65-86F7-415E-BF4A-381AA8AB9CCC} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{2AD6973D-C7BB-416E-89FE-EEE34664E05F} = {8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}
 		{33B1BC8D-E292-4972-A363-22056B207156} = {75E7476C-C05B-4C41-8E38-081D3EB55659}
 		{CB70A642-8CEC-4DDE-8C9F-AD08900EC98D} = {84650275-884D-4CBB-9CC0-67553996E211}
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs
index f5b587871..d3295b516 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs
@@ -107,15 +107,15 @@ namespace Orchard.Indexing.Commands {
         }
 
         [CommandName("index refresh")]
-        [CommandHelp("index refresh /ContenItem:<content item id> \r\n\t" + "Refreshes the index for the specifed <content item id>")]
+        [CommandHelp("index refresh /ContentItemId:<content item id> \r\n\t" + "Refreshes the index for the specifed <content item id>")]
         [OrchardSwitches("ContentItem")]
         public string Refresh() {
-            int contenItemId;
-            if ( !int.TryParse(ContentItemId, out contenItemId) ) {
+            int contentItemId;
+            if ( !int.TryParse(ContentItemId, out contentItemId) ) {
                 return "Invalid content item id. Not an integer.";
             }
 
-            var contentItem = _contentManager.Get(contenItemId);
+            var contentItem = _contentManager.Get(contentItemId);
             _indexingTaskManager.CreateUpdateIndexTask(contentItem);
 
             return "Content Item marked for reindexing";
diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
index 185e8ee1f..f17721898 100644
--- a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
@@ -3,6 +3,8 @@ using System.Linq;
 using System.Web.Mvc;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
+using Orchard.Core.Contents.Controllers;
+using Orchard.Core.Contents.Settings;
 using Orchard.Core.Routable.Models;
 using Orchard.DisplayManagement;
 using Orchard.Localization.Models;
@@ -46,14 +48,14 @@ namespace Orchard.Localization.Controllers {
                 var metadata = _contentManager.GetItemMetadata(contentItem);
                 return RedirectToAction(Convert.ToString(metadata.EditorRouteValues["action"]), metadata.EditorRouteValues);
             }
-
+            
             var siteCultures = _cultureManager.ListCultures().Where(s => s != _localizationService.GetContentCulture(contentItem) && s != _cultureManager.GetSiteCulture());
             var selectedCulture = siteCultures.SingleOrDefault(s => string.Equals(s, to, StringComparison.OrdinalIgnoreCase))
                 ?? _cultureManager.GetCurrentCulture(HttpContext); // could be null but the person doing the translating might be translating into their current culture
 
             //todo: need a better solution for modifying some parts when translating - or go with a completely different experience
             if (contentItem.Has<RoutePart>()) {
-                var routePart = contentItem.As<RoutePart>();
+                RoutePart routePart = contentItem.As<RoutePart>();
                 routePart.Slug = string.Format("{0}{2}{1}", routePart.Slug, siteCultures.Any(s => string.Equals(s, selectedCulture, StringComparison.OrdinalIgnoreCase)) ? selectedCulture : "", !string.IsNullOrWhiteSpace(routePart.Slug) ? "-" : "");
                 routePart.Path = null;
             }
@@ -66,13 +68,29 @@ namespace Orchard.Localization.Controllers {
                 SiteCultures = siteCultures,
                 Content = _contentManager.BuildEditor(contentItem)
             };
+
+            // Cancel transaction so that the routepart is not modified.
             Services.TransactionManager.Cancel();
 
             return View(model);
         }
 
         [HttpPost, ActionName("Translate")]
+        [FormValueRequired("submit.Save")]
         public ActionResult TranslatePOST(int id) {
+            return TranslatePOST(id, contentItem => {
+                if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
+                    Services.ContentManager.Publish(contentItem);
+            });
+        }
+
+        [HttpPost, ActionName("Translate")]
+        [FormValueRequired("submit.Publish")]
+        public ActionResult TranslateAndPublishPOST(int id) {
+            return TranslatePOST(id, contentItem => Services.ContentManager.Publish(contentItem));
+        }
+
+        public ActionResult TranslatePOST(int id, Action<ContentItem> conditionallyPublish) {
             var contentItem = _contentManager.Get(id, VersionOptions.Latest);
 
             if (contentItem == null)
@@ -86,19 +104,18 @@ namespace Orchard.Localization.Controllers {
             if (existingTranslation != null) {
                 // edit existing
                 contentItemTranslation = _contentManager.Get(existingTranslation.ContentItem.Id, VersionOptions.DraftRequired);
-            }
-            else {
+            } else {
                 // create
                 contentItemTranslation = _contentManager.New(contentItem.ContentType);
+                contentItemTranslation.As<ICommonPart>().Container = contentItem.As<ICommonPart>().Container;
+
                 var localized = contentItemTranslation.As<LocalizationPart>();
                 localized.MasterContentItem = contentItem;
                 if (!string.IsNullOrWhiteSpace(model.SelectedCulture))
                     localized.Culture = _cultureManager.GetCultureByName(model.SelectedCulture);
                 _contentManager.Create(contentItemTranslation, VersionOptions.Draft);
 
-                if (!contentItem.Has<IPublishingControlAspect>() && contentItem.VersionRecord != null && contentItem.VersionRecord.Published) {
-                    _contentManager.Publish(contentItemTranslation);
-                }
+                conditionallyPublish(contentItemTranslation);
             }
 
             model.Content = _contentManager.UpdateEditor(contentItemTranslation, this);
@@ -111,7 +128,12 @@ namespace Orchard.Localization.Controllers {
                 return View(model);
             }
 
-            Services.Notifier.Information(T("Created content item translation."));
+            if (existingTranslation != null) {
+                Services.Notifier.Information(T("Edited content item translation."));
+            }
+            else {
+                Services.Notifier.Information(T("Created content item translation."));
+            }
 
             var metadata = _contentManager.GetItemMetadata(model.Content);
             if (metadata.EditorRouteValues == null)