Merge branch 'heyman/master'

celery/worker/__init__.py

@@ -253,6 +253,8 @@ class WorkController(object):
         except SystemTerminate:
             self.terminate()
             raise
+        except SystemExit, e:
+            self.terminate()
         except:
             self.stop()
             try: