Merge closures into main development branch.

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

diff --cc Cython/Compiler/Parsing.pxd
index 139973785d12ec0f58a48ddc8a02a87924d5809e,3fa7ccb5e28395c2a8d842911fa1867e09b882a8..24ba31a1b36015d9689cb473a072cba5d3e13886
--- 1/Cython/Compiler/Parsing.pxd
--- 2/Cython/Compiler/Parsing.pxd
+++ b/Cython/Compiler/Parsing.pxd
@@@ -130,8 -138,8 +138,8 @@@ cpdef p_cdef_statement(PyrexScanner s, 
  cpdef p_cdef_block(PyrexScanner s, ctx)
  cpdef p_cdef_extern_block(PyrexScanner s, pos, ctx)
  cpdef p_c_enum_definition(PyrexScanner s, pos, ctx)
- cpdef p_c_enum_line(PyrexScanner s, ctx, items)
- cpdef p_c_enum_item(PyrexScanner s, ctx, items)
 -cpdef p_c_enum_line(PyrexScanner s, list items)
 -cpdef p_c_enum_item(PyrexScanner s, list items)
++cpdef p_c_enum_line(PyrexScanner s, ctx, list items)
++cpdef p_c_enum_item(PyrexScanner s, ctx, list items)
  cpdef p_c_struct_or_union_definition(PyrexScanner s, pos, ctx)
  cpdef p_visibility(PyrexScanner s, prev_visibility)
  cpdef p_c_modifiers(PyrexScanner s)

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

diff --cc tests/bugs.txt
index 4f10075538f9e9cc3bd13d598baabf46c6b74ea1,e7eac6805065dac4c356ea4edbf74232c5df5541..5c9a777dbda4c84671fbac9b1e2ff1e076fc5d9f
--- 1/tests/bugs.txt
--- 2/tests/bugs.txt
+++ b/tests/bugs.txt
@@@ -11,8 -11,9 +11,10 @@@ cascaded_list_unpacking_T46
  compile.cpp_operators
  cpp_templated_ctypedef
  cpp_structs
+ genexpr_T491
  with_statement_module_level_T536
 +function_as_method_T494
+ closure_inside_cdef_T554
  
  # CPython regression tests that don't current work:
  pyregr.test_threadsignals