Merge with 6.0.6

src/Umbraco.Core/XmlHelper.cs

@@ -192,6 +192,7 @@ namespace Umbraco.Core
             }
         }
 
+
 		/// <summary>
         /// Imports a XML node from text.
         /// </summary>

src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs

@@ -794,7 +794,7 @@ namespace umbraco.MacroEngines
                 {
                     try
                     {
-                        XElement e = XElement.Parse(DynamicXml.StripDashesInElementOrAttributeNames(sResult), LoadOptions.None);
+                        XElement e = XElement.Parse(XmlHelper.StripDashesInElementOrAttributeNames(sResult), LoadOptions.None);
                         if (e != null)
                         {
                             //check that the document element is not one of the disallowed elements

src/umbraco.MacroEngines/RazorDynamicNode/DynamicXml.cs

@@ -8,6 +8,7 @@ using System.Xml.XPath;
 using System.Collections;
 using System.IO;
 using System.Web;
+using Umbraco.Core;
 
 namespace umbraco.MacroEngines
 {
@@ -381,9 +382,10 @@ namespace umbraco.MacroEngines
             return test(this) ? new HtmlString(valueIfTrue) : new HtmlString(valueIfFalse);
         }
 
+        [Obsolete("Use XmlHelper.StripDashesInElementOrAttributeNames instead")]
         public static string StripDashesInElementOrAttributeNames(string xml)
         {
-        	return Umbraco.Core.Dynamics.DynamicXml.StripDashesInElementOrAttributeNames(xml);
+            return XmlHelper.StripDashesInElementOrAttributeNames(xml);
         }
     }
 }

src/umbraco.MacroEngines/RazorDynamicNode/ExamineBackedMedia.cs

@@ -479,5 +479,6 @@ namespace umbraco.MacroEngines
             propertyExists = false;
             return null;
         }
+
     }
 }