Merge commit '98703c7fbfcf06348220aa63f9422cdd792cfe1a'

diff --combined youtube_dl/extractor/__init__.py
index 7af0cfd8fa816ca765364b755c343bc65c2a798f,7f0736ee82f9fa7784c4c1e152b18171fe2ab2cb..4b83d8d9964b6c5e73c3968c8a8fe1da974fe36e
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -4,13 -4,12 +4,13 @@@ from .addanime import AddAnimeI
  from .adultswim import AdultSwimIE
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
 +from .anysex import AnySexIE
  from .aol import AolIE
  from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
 -from .ard import ARDIE
 +from .ard import ARDIE, ARDMediathekIE
  from .arte import (
      ArteTvIE,
      ArteTVPlus7IE,
@@@ -24,7 -23,6 +24,7 @@@ from .auengine import AUEngineI
  from .bambuser import BambuserIE, BambuserChannelIE
  from .bandcamp import BandcampIE, BandcampAlbumIE
  from .bbccouk import BBCCoUkIE
 +from .beeg import BeegIE
  from .bilibili import BiliBiliIE
  from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
@@@ -46,7 -44,6 +46,7 @@@ from .cinemassacre import CinemassacreI
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
 +from .cloudy import CloudyIE
  from .clubic import ClubicIE
  from .cmt import CMTIE
  from .cnet import CNETIE
@@@ -68,12 -65,9 +68,12 @@@ from .dailymotion import 
      DailymotionUserIE,
  )
  from .daum import DaumIE
 +from .dbtv import DBTVIE
 +from .deezer import DeezerPlaylistIE
  from .dfb import DFBIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
 +from .drtuber import DrTuberIE
  from .drtv import DRTVIE
  from .dump import DumpIE
  from .defense import DefenseGouvFrIE
@@@ -83,15 -77,15 +83,16 @@@ from .dropbox import DropboxI
  from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE
  from .eighttracks import EightTracksIE
+ from .einthusan import EinthusanIE
  from .eitb import EitbIE
  from .ellentv import (
      EllenTVIE,
      EllenTVClipsIE,
  )
  from .elpais import ElPaisIE
 -from .empflix import EmpflixIE
 +from .empflix import EMPFlixIE
  from .engadget import EngadgetIE
 +from .eporner import EpornerIE
  from .escapist import EscapistIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
@@@ -141,8 -135,6 +142,8 @@@ from .grooveshark import GroovesharkI
  from .hark import HarkIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
 +from .hornbunny import HornBunnyIE
 +from .hostingbulk import HostingBulkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .howstuffworks import HowStuffWorksIE
@@@ -203,7 -195,6 +204,7 @@@ from .mitele import MiTeleI
  from .mixcloud import MixcloudIE
  from .mlb import MLBIE
  from .mpora import MporaIE
 +from .moevideo import MoeVideoIE
  from .mofosex import MofosexIE
  from .mojvideo import MojvideoIE
  from .mooshare import MooshareIE
@@@ -219,7 -210,6 +220,7 @@@ from .mtv import 
      MTVIggyIE,
  )
  from .musicplayon import MusicPlayOnIE
 +from .musicvault import MusicVaultIE
  from .muzu import MuzuTVIE
  from .myspace import MySpaceIE
  from .myspass import MySpassIE
@@@ -240,7 -230,6 +241,7 @@@ from .niconico import NiconicoI
  from .ninegag import NineGagIE
  from .noco import NocoIE
  from .normalboots import NormalbootsIE
 +from .nosvideo import NosVideoIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
@@@ -268,8 -257,6 +269,8 @@@ from .podomatic import PodomaticI
  from .pornhd import PornHdIE
  from .pornhub import PornHubIE
  from .pornotube import PornotubeIE
 +from .pornoxo import PornoXOIE
 +from .promptfile import PromptFileIE
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .radiofrance import RadioFranceIE
@@@ -301,7 -288,6 +302,7 @@@ from .scivee import SciVeeI
  from .screencast import ScreencastIE
  from .servingsys import ServingSysIE
  from .shared import SharedIE
 +from .sharesix import ShareSixIE
  from .sina import SinaIE
  from .slideshare import SlideshareIE
  from .slutload import SlutloadIE
@@@ -327,15 -313,13 +328,15 @@@ from .southpark import 
  )
  from .space import SpaceIE
  from .spankwire import SpankwireIE
 -from .spiegel import SpiegelIE
 +from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
 +from .sportdeutschland import SportDeutschlandIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
  from .streamcz import StreamCZIE
 +from .sunporno import SunPornoIE
  from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
@@@ -348,7 -332,6 +349,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
@@@ -356,7 -339,6 +357,7 @@@ from .theplatform import ThePlatformI
  from .thisav import ThisAVIE
  from .tinypic import TinyPicIE
  from .tlc import TlcIE, TlcDeIE
 +from .tnaflix import TNAFlixIE
  from .toutv import TouTvIE
  from .toypics import ToypicsUserIE, ToypicsIE
  from .traileraddict import TrailerAddictIE
@@@ -365,7 -347,6 +366,7 @@@ from .trutube import TruTubeI
  from .tube8 import Tube8IE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
 +from .turbo import TurboIE
  from .tutv import TutvIE
  from .tvigle import TvigleIE
  from .tvp import TvpIE
@@@ -383,7 -364,6 +384,7 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vesti import VestiIE
  from .vevo import VevoIE
 +from .vgtv import VGTVIE
  from .vh1 import VH1IE
  from .viddler import ViddlerIE
  from .videobam import VideoBamIE
@@@ -411,7 -391,6 +412,7 @@@ from .vine import 
  from .viki import VikiIE
  from .vk import VKIE
  from .vodlocker import VodlockerIE
 +from .vporn import VpornIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
  from .vulture import VultureIE