merged in latest cython-devel

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

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

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

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

diff --cc runtests.py
index 81bbdca04b352b74fdc7518835d62432014c3ec8,3e1ea1ca2eb4f7967d8f91bb30d776bd3bb330a7..d06cd260286559e1739e19ed2bc158e04426f008
--- 1/runtests.py
--- 2/runtests.py
+++ b/runtests.py
@@@ -51,12 -51,10 +51,13 @@@ EXT_DEP_INCLUDES = 
  VER_DEP_MODULES = {
      # tests are excluded if 'CurrentPythonVersion OP VersionTuple', i.e.
      # (2,4) : (operator.le, ...) excludes ... when PyVer <= 2.4.x
 +    (2,5) : (operator.lt, lambda x: x in ['run.any',
 +                                          'run.all',
 +                                          ]),
      (2,4) : (operator.le, lambda x: x in ['run.extern_builtins_T258'
                                            ]),
-     (2,6) : (operator.lt, lambda x: x in ['run.print_function'
+     (2,6) : (operator.lt, lambda x: x in ['run.print_function',
+                                           'run.cython3',
                                            ]),
      (3,): (operator.ge, lambda x: x in ['run.non_future_division',
                                          'compile.extsetslice',