Merge branch 'jukebox' of https://github.com/remitamine/youtube-dl into remitamine...

diff --cc youtube_dl/extractor/__init__.py
index e46d73ed7774f6f1a2ddc6acc9f2dace3ffb5478,1813c7e1b1346302ac4e215e6687935a61f0b297..75d191d5dd695d00b3ba816e03b05037a595ff58
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -302,8 -262,6 +302,7 @@@ from .izlesene import IzleseneI
  from .jadorecettepub import JadoreCettePubIE
  from .jeuxvideo import JeuxVideoIE
  from .jove import JoveIE
- from .jukebox import JukeboxIE
 +from .jwplatform import JWPlatformIE
  from .jpopsukitv import JpopsukiIE
  from .kaltura import KalturaIE
  from .kanalplay import KanalPlayIE

diff --cc youtube_dl/extractor/generic.py
index 3c3066e38c5efb4734e1c564be38424d4bd4e004,4d1f75e6397ed4e617f30223e26e17284ee0c354..70a8d8eb9fdf1ad1dd90c031945f49ba9bcdf542
--- 1/youtube_dl/extractor/generic.py
--- 2/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -52,10 -50,7 +52,11 @@@ from .dailymotion import DailymotionClo
  from .onionstudios import OnionStudiosIE
  from .snagfilms import SnagFilmsEmbedIE
  from .screenwavemedia import ScreenwaveMediaIE
 +from .mtv import MTVServicesEmbeddedIE
 +from .pladform import PladformIE
 +from .googledrive import GoogleDriveIE
 +from .jwplatform import JWPlatformIE
+ from .ultimedia import UltimediaIE
  
  
  class GenericIE(InfoExtractor):