Merge branch 'master' of https://github.com/cython/cython

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

diff --cc Cython/Compiler/Errors.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
index bde6a6331b889fe0c7da1f88cc256e1d7e3c73ed,be4d73db807381220566fe95f4f00216f62bad9e..dbe49e0233f45436b99c344f6722ae4f53002f57
--- 1/Cython/Compiler/ParseTreeTransforms.py
--- 2/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -6,20 -15,11 +15,17 @@@ import Option
  from Cython.Compiler.Visitor import VisitorTransform, TreeVisitor
  from Cython.Compiler.Visitor import CythonTransform, EnvTransform, ScopeTrackingTransform
  from Cython.Compiler.ModuleNode import ModuleNode
- from Cython.Compiler.Nodes import *
- from Cython.Compiler.ExprNodes import *
- from Cython.Compiler.UtilNodes import *
+ from Cython.Compiler.UtilNodes import LetNode, LetRefNode
  from Cython.Compiler.TreeFragment import TreeFragment, TemplateTransform
  from Cython.Compiler.StringEncoding import EncodedString
- from Cython.Compiler.Errors import error, warning, CompileError
- from Cython.Compiler import PyrexTypes, Naming
+ from Cython.Compiler.Errors import error, warning, CompileError, InternalError
  
 +
 +try:
 +    set
 +except NameError:
 +    from sets import Set as set
 +
  import copy
  
  

diff --cc runtests.py
Simple merge