Merge commit 'a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624'

Conflicts:
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj

Change-Id: I3421c2d5c114765e924d7847cee46ebd370dfca6

1 files changed, 2 insertions, 1 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
index 4b364168cf..6ce67a3abd 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
@@ -80,7 +80,8 @@ public class BlockNode extends Node implements IVariableNode {
                 String interpolation = "#{$" + var.getName() + "}";
                 if (selector.contains(interpolation)) {
                     String replace = selector.replace(interpolation, var
-                            .getExpr().toString());
+                            .getExpr().unquotedString());
+
                     selectorList.add(selectorList.indexOf(selector), replace);
                     selectorList.remove(selector);
                 }