merge of Cython 0.9.6.9

diff --cc Cython/Compiler/Options.py
index 8386015a053057da06a0ad406d231ef79733467a,533b87db1f8887c1cc10eff1010b6374fe33813a..9f1bc141f70d9e06637bb99f54d8fe9db9dfa219
--- 1/Cython/Compiler/Options.py
--- 2/Cython/Compiler/Options.py
+++ b/Cython/Compiler/Options.py
@@@ -18,4 -19,6 +19,6 @@@ incref_local_binop = 
  
  # Decref global variables in this module on exit for garbage collection. 
  # 0: None, 1+: interned objects, 2+: cdef globals, 3+: types objects
 -generate_cleanup_code = 1
 +generate_cleanup_code = 3
+ 
+ annotate = 0