diff --git a/change_log.txt b/change_log.txt
index f3f19213..bdeb069a 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,9 @@
 ===== SVN trunk  =====
+
+10/01/2010
+- bugfix when using {$smarty.block.child} and name of {block} was in double quoted string
+- bugfix updateParentVariables() was called twice when leaving {include} processing
+
 - bugfix mb_str_replace in replace and escape modifiers work with utf8
 
 31/12/2010
diff --git a/libs/sysplugins/smarty_internal_compile_block.php b/libs/sysplugins/smarty_internal_compile_block.php
index b1b64374..cd1ca281 100644
--- a/libs/sysplugins/smarty_internal_compile_block.php
+++ b/libs/sysplugins/smarty_internal_compile_block.php
@@ -96,7 +96,7 @@ class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
         	$stack_count = count($compiler->_tag_stack);
             while (--$stack_count >= 0) {
             	if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                	$_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'");
+                	$_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\"");
                 	break;
                 }
             }
diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php
index ea323101..01d260eb 100644
--- a/libs/sysplugins/smarty_internal_compile_include.php
+++ b/libs/sysplugins/smarty_internal_compile_include.php
@@ -163,7 +163,9 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
                 $_output .= "<?php \$_smarty_tpl = array_pop(\$_tpl_stack);?>";
             } else {
                 $_output .= " echo \$_template->getRenderedTemplate();?>";
-                $_output .= "<?php \$_template->updateParentVariables($_parent_scope);?>";
+                if ($_parent_scope != Smarty::SCOPE_LOCAL) {
+                	$_output .= "<?php \$_template->updateParentVariables($_parent_scope);?>";
+            	}
             } 
         } 
         $_output .= "<?php unset(\$_template);?>";