Merge branch 'master' into jobqueue

telegram/dispatcher.py

@@ -25,7 +25,6 @@ from functools import wraps
 from inspect import getargspec
 from threading import Thread, BoundedSemaphore, Lock
 from re import match
-from traceback import print_exc
 
 from telegram import (TelegramError, Update, NullHandler)
 
@@ -188,7 +187,7 @@ class Dispatcher:
 
                 # All other errors should not stop the thread, just print them
                 except:
-                    print_exc()
+                    self.logger.exception()
         else:
             self.__lock.release()
         self.logger.info('Dispatcher thread stopped')