Merge remote-tracking branch 'adammw/tenplay'

diff --combined youtube_dl/extractor/__init__.py
index 44e1708ed8dfc2044062027caa3d82e20bf90e30,a2c12fc8e5ceda7857d084c50070fc6b64cec953..5a273fc0f904de744df97bdcdcfaefe3f3660002
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -3,7 -3,6 +3,7 @@@ from .addanime import AddAnimeI
  from .aftonbladet import AftonbladetIE
  from .anitube import AnitubeIE
  from .aol import AolIE
 +from .allocine import AllocineIE
  from .aparat import AparatIE
  from .appletrailers import AppleTrailersIE
  from .archiveorg import ArchiveOrgIE
@@@ -64,7 -63,6 +64,7 @@@ from .dailymotion import 
  from .daum import DaumIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
 +from .drtv import DRTVIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE
@@@ -111,8 -109,6 +111,8 @@@ from .gdcvault import GDCVaultI
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 +from .gorillavid import GorillaVidIE
 +from .goshgay import GoshgayIE
  from .hark import HarkIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
@@@ -146,15 -142,10 +146,15 @@@ from .khanacademy import KhanAcademyI
  from .kickstarter import KickStarterIE
  from .keek import KeekIE
  from .kontrtube import KontrTubeIE
 +from .ku6 import Ku6IE
  from .la7 import LA7IE
  from .lifenews import LifeNewsIE
  from .liveleak import LiveLeakIE
 -from .livestream import LivestreamIE, LivestreamOriginalIE
 +from .livestream import (
 +    LivestreamIE,
 +    LivestreamOriginalIE,
 +    LivestreamShortenerIE,
 +)
  from .lynda import (
      LyndaIE,
      LyndaCourseIE
@@@ -172,13 -163,11 +172,13 @@@ from .mpora import MporaI
  from .mofosex import MofosexIE
  from .mooshare import MooshareIE
  from .morningstar import MorningstarIE
 +from .motherless import MotherlessIE
  from .motorsport import MotorsportIE
  from .moviezine import MoviezineIE
  from .movshare import MovShareIE
  from .mtv import (
      MTVIE,
 +    MTVServicesEmbeddedIE,
      MTVIggyIE,
  )
  from .musicplayon import MusicPlayOnIE
@@@ -205,11 -194,7 +205,11 @@@ from .normalboots import NormalbootsI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 -from .nrk import NRKIE
 +from .npo import NPOIE
 +from .nrk import (
 +    NRKIE,
 +    NRKTVIE,
 +)
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
@@@ -227,7 -212,6 +227,7 @@@ from .pornotube import PornotubeI
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .radiofrance import RadioFranceIE
 +from .rai import RaiIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
@@@ -264,7 -248,6 +264,7 @@@ from .soundcloud import 
      SoundcloudUserIE,
      SoundcloudPlaylistIE
  )
 +from .soundgasm import SoundgasmIE
  from .southparkstudios import (
      SouthParkStudiosIE,
      SouthparkDeIE,
@@@ -272,24 -255,17 +272,25 @@@
  from .space import SpaceIE
  from .spankwire import SpankwireIE
  from .spiegel import SpiegelIE
 +from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
  from .streamcloud import StreamcloudIE
  from .streamcz import StreamCZIE
 +from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
 +from .tagesschau import TagesschauIE
 +from .teachertube import (
 +    TeacherTubeIE,
 +    TeacherTubeUserIE,
 +)
 +from .teachingchannel import TeachingChannelIE
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
+ from .tenplay import TenPlayIE
  from .testurl import TestURLIE
  from .tf1 import TF1IE
  from .theplatform import ThePlatformIE
@@@ -319,7 -295,6 +320,7 @@@ from .veehd import VeeHDI
  from .veoh import VeohIE
  from .vesti import VestiIE
  from .vevo import VevoIE
 +from .vh1 import VH1IE
  from .viddler import ViddlerIE
  from .videobam import VideoBamIE
  from .videodetective import VideoDetectiveIE
@@@ -337,17 -312,14 +338,17 @@@ from .vimeo import 
      VimeoReviewIE,
      VimeoWatchLaterIE,
  )
 +from .vimple import VimpleIE
  from .vine import (
      VineIE,
      VineUserIE,
  )
  from .viki import VikiIE
  from .vk import VKIE
 +from .vodlocker import VodlockerIE
  from .vube import VubeIE
  from .vuclip import VuClipIE
 +from .vulture import VultureIE
  from .washingtonpost import WashingtonPostIE
  from .wat import WatIE
  from .wdr import (
@@@ -359,7 -331,6 +360,7 @@@ from .weibo import WeiboI
  from .wimp import WimpIE
  from .wistia import WistiaIE
  from .worldstarhiphop import WorldStarHipHopIE
 +from .wrzuta import WrzutaIE
  from .xbef import XBefIE
  from .xhamster import XHamsterIE
  from .xnxx import XNXXIE