merged with latest cython-devel

diff --cc Cython/Compiler/ExprNodes.py
Simple merge

diff --cc Cython/Compiler/Nodes.py
Simple merge

diff --cc Cython/Compiler/Optimize.py
Simple merge

diff --cc Cython/Compiler/ParseTreeTransforms.py
Simple merge

diff --cc Cython/Compiler/Parsing.pxd
Simple merge

diff --cc Cython/Compiler/Parsing.py
Simple merge

diff --cc Cython/Compiler/Symtab.py
index 44e1ca63bbea68eddb05235541fc4dbb74bad670,13395144e41bf4ea6f52ba400feeb55e9faf930e..483a238d47b97fc2d23d0614d9d932108435818a
--- 1/Cython/Compiler/Symtab.py
--- 2/Cython/Compiler/Symtab.py
+++ b/Cython/Compiler/Symtab.py
@@@ -223,9 -219,8 +223,10 @@@ class Scope(object)
  
      is_py_class_scope = 0
      is_c_class_scope = 0
 +    is_closure_scope = 0
+     is_cpp_class_scope = 0
      is_module_scope = 0
 +    is_internal = 0
      scope_prefix = ""
      in_cinclude = 0
      nogil = 0
@@@ -444,10 -476,10 +483,10 @@@
          if type.is_cpp_class and visibility != 'extern':
              constructor = type.scope.lookup(u'<init>')
              if constructor is not None and PyrexTypes.best_match([], constructor.all_alternatives()) is None:
-                 error(pos, "C++ class must have an empty constructor to be stack allocated")
+                 error(pos, "C++ class must have a default constructor to be stack allocated")
          entry = self.declare(name, cname, type, pos, visibility)
          entry.is_variable = 1
 -        self.control_flow.set_state((), (name, 'initalized'), False)
 +        self.control_flow.set_state((), (name, 'initialized'), False)
          return entry
          
      def declare_builtin(self, name, pos):