Merge branch 'devel' into bigbreak

Conflicts:
	web/news.txt

2 files changed, 5 insertions, 1 deletions

diff --git a/tests/modules/texport.nim b/tests/modules/texport.nim
index 99228dfce..9515f9060 100644
--- a/tests/modules/texport.nim
+++ b/tests/modules/texport.nim
@@ -4,6 +4,9 @@ discard """
 
 import mexporta
 
+# bug #1029:
+from rawsockets import accept
+
 # B.TMyObject has been imported implicitly here: 
 var x: TMyObject
 echo($x, q(0), q"0")
diff --git a/tests/modules/tselfimport.nim b/tests/modules/tselfimport.nim
index f20a40407..ddb3a5b09 100644
--- a/tests/modules/tselfimport.nim
+++ b/tests/modules/tselfimport.nim
@@ -1,8 +1,9 @@
 discard """
   file: "tselfimport.nim"
-  line: 6
+  line: 7
   errormsg: "A module cannot import itself"
 """
+import strutils as su # guard against regression
 import tselfimport #ERROR
 echo("Hello World")