merge of 0.9.6.4

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

diff --cc Cython/Compiler/Nodes.py
index 19e62970d2ccdc2508cdbcf18841073223293681,86ec00d8e102a7d2c2beda9ae3c67c553436c362..c447968a78733db3c94f8fa97da1c53a7a76d469
--- 1/Cython/Compiler/Nodes.py
--- 2/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@@ -2600,8 -2630,10 +2630,10 @@@ utility_function_predeclarations = 
  
  typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/
  typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
 -typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
 +typedef struct {PyObject **p; char *s; long n; int is_unicode;} __Pyx_StringTabEntry; /*proto*/
  
+ #define __pyx_PyIndex_AsSsize_t(b) PyInt_AsSsize_t(PyNumber_Index(b))
+ 
  #define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
  static INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
     if (x == Py_True) return 1;

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

diff --cc Cython/Compiler/Version.py
index 54e34e5c4c3e65ad0f39814ae4443507276dec2d,cc9cd1e91155ceefd7c69a0e20ce43be6fc6d421..47d6addf6a326f9b2b53f9091ce0471fa12a3921
--- 1/Cython/Compiler/Version.py
--- 2/Cython/Compiler/Version.py
+++ b/Cython/Compiler/Version.py
@@@ -1,1 -1,1 +1,1 @@@
- version = '0.9.6'
 -version = '0.9.6.3'
++version = '0.9.6.4'