diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index ec231e8c..66fd48f 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -192,3 +192,8 @@
 
     # Main thread terminates, but the server continues running
     # until server.shutdown() is called.
+    try:
+        while server_thread.isAlive(): 
+            server_thread.join(1)
+    except (KeyboardInterrupt, SystemExit):
+        server.shutdown()
diff --git a/src/version.c b/src/version.c
index d857ed2..598d430 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1370,
+/**/
     1369,
 /**/
     1368,