+ (Lava) Fixed an issue with combined person data getting double enco…

…ded in the merge template process (Fixes #4884).

DotLiquid/Variable.cs

@@ -59,23 +59,16 @@ public Variable(string markup)
 
 		public void Render(Context context, TextWriter result)
 		{
-			object output = RenderInternal(context);
+            // Do not apply transforms here as it will be done below.
+			object output = RenderInternal(context, false);
 
 			if (output is ILiquidizable)
 				output = null;
 
 			if (output != null)
 			{
-                // see if this context has a ValueTypeTranformer for the type
-                var transformer = context.GetValueTypeTransformer(output.GetType());
-                if (transformer == null)
-                {
-                    // if the context doesn't have a ValueTypeTranformer for the type, get the global one (if there is one)
-                    transformer = Template.GetValueTypeTransformer(output.GetType());
-                }
-
-                if(transformer != null)
-                    output = transformer(output);
+                // Apply any required transforms to the context value prior to passing it to the filter pipeline.
+                output = ApplyValueTypeTransforms( context, output );
 
 				string outputString;
 				if (output is IEnumerable)
@@ -95,15 +88,18 @@ public void Render(Context context, TextWriter result)
 			}
 		}
 
-		private object RenderInternal(Context context)
+		private object RenderInternal(Context context, bool applyTransforms = true)
 		{
 			if (Name == null)
 				return null;
 
 			object output = context[Name];
 
-            // Apply any required transforms to the context value prior to passing it to the filter pipeline.
-            output = ApplyValueTypeTransforms( context, output );
+            if ( applyTransforms )
+            {
+                // Apply any required transforms to the context value prior to passing it to the filter pipeline.
+                output = ApplyValueTypeTransforms( context, output );
+            }
 
             Filters.ToList().ForEach(filter =>
 			{