Merge remote branch 'upstream/master'

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

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

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

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

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

diff --cc runtests.py
Simple merge