merge 3.4-slp (Stackless python#98)

Author: Anselm Kruis

Stackless/unittests/test_defects.py

@@ -493,6 +493,7 @@ def other_thread(self, pickler, c):
         else:
             self.killed = False
 
+    @unittest.skipUnless(withThreads, "requires thread support")
     def test_kill_during_cPickle_stack_switch(self):
         # this test kills the main/current tasklet of a other-thread,
         # which is fast-pickling a recursive structure. This leads to an