-devel mergeback

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

diff --cc Cython/Compiler/ExprNodes.py
index 731d4ecaecd12ad8931ffb9b8b5f1ea1e89eb5bf,f14f1817568089f15f695b1893d8e27773d5c29e..e9d2641d33d665b798eb7530c8105b1aae37c150
--- 1/Cython/Compiler/ExprNodes.py
--- 2/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@@ -4,9 -4,9 +4,9 @@@
  
  import operator
  
- from Errors import error, warning, InternalError
+ from Errors import error, warning, warn_once, InternalError
  from Errors import hold_errors, release_errors, held_errors, report_error
 -from Cython.Utils import UtilityCode
 +from Code import UtilityCode
  import StringEncoding
  import Naming
  import Nodes

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

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

diff --cc tests/bugs.txt
index 3c6ad215bfde7d2c233745a6d0802ad6bc221bdf,cf17375d17a606d65fa7b599807ae2ca56187fc9..b4f0de4a56b5db1aa43557be0b5d49cc373e182a
--- 1/tests/bugs.txt
--- 2/tests/bugs.txt
+++ b/tests/bugs.txt
@@@ -6,8 -6,8 +6,5 @@@ class_attribute_init_values_T1
  numpy_ValueError_T172
  unsignedbehaviour_T184
  funcexc_iter_T228
 -ext_instance_type_T232
 -large_consts_T237
  bad_c_struct_T252
  missing_baseclass_in_predecl_T262
- 
- # Not yet enabled
- profile_test