Merge branch '3.0'

Conflicts:
	celery/exceptions.py
	funtests/benchmarks/bench_worker.py

celery/exceptions.py

@@ -114,7 +114,7 @@ class Retry(Exception):
         if self.message:
             return self.message
         if self.excs:
-            return 'Retry {0}: {1!r}'.format(self.humanize(), self.excs)
+            return 'Retry {0}: {1}'.format(self.humanize(), self.excs)
         return 'Retry {0}'.format(self.humanize())
 
     def __reduce__(self):