Merge commit 'd214efa39a011002eb88e683676508e438842fe4'

Conflicts:
	client/src/com/vaadin/client/ui/orderedlayout/Slot.java

Change-Id: I2fb5d1ac4b5c10a1fe5b1a6f976c1f59283b9169

1 files changed, 4 insertions, 10 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
index 0469333965..feb1d7e622 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/MixinNodeHandler.java
@@ -60,16 +60,10 @@ public class MixinNodeHandler {
             }
 
             Node previous = mixinNode;
-            for (final Node child : defClone.getChildren()) {
-
-                Node clone = (Node) DeepCopy.copy(child);
-
-                replaceChildVariables(defClone, clone);
-
-                mixinNode.getParentNode().appendChild(clone, previous);
-
-                previous = clone;
-
+            for (final Node child : new ArrayList<Node>(defClone.getChildren())) {
+                replaceChildVariables(defClone, child);
+                mixinNode.getParentNode().appendChild(child, previous);
+                previous = child;
             }
 
         }