Merge remote-tracking branch 'origin/master'

diff --combined youtube_dl/extractor/__init__.py
index eba7dc0a293bbe7101660cf0a7ad7efb738b1a9d,13b3616d31b4d935828f60ca126726a4b9f5111d..4423f78a54f1b1d700a07dc76a78f865975f1525
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -68,7 -68,6 +68,7 @@@ from .dailymotion import 
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
 +from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
@@@ -346,6 -345,7 +346,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
+ from .telemb import TeleMBIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE
  from .tf1 import TF1IE