Merge remote branch 'upstream/master'

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

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

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

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

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