Merge remote-tracking branch 'fstirlitz/master'

diff --combined youtube_dl/extractor/__init__.py
index 027fb06f93763051a45b34b22c1744f280907470,c0dcdaf02167e365c442fae5a6ebed4984ce1b42..6b7660ab1585b998f6f8d807db6e8a0147b1526b
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -30,7 -30,6 +30,7 @@@ from .bandcamp import BandcampIE, Bandc
  from .bbccouk import BBCCoUkIE
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
 +from .bet import BetIE
  from .bild import BildIE
  from .bilibili import BiliBiliIE
  from .blinkx import BlinkxIE
@@@ -51,7 -50,6 +51,6 @@@ from .cbsnews import CBSNewsI
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
  from .chilloutzone import ChilloutzoneIE
- from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
@@@ -336,6 -334,7 +335,7 @@@ from .savefrom import SaveFromI
  from .sbs import SBSIE
  from .scivee import SciVeeIE
  from .screencast import ScreencastIE
+ from .screenwavemedia import ScreenwaveMediaIE
  from .servingsys import ServingSysIE
  from .sexu import SexuIE
  from .sexykarma import SexyKarmaIE
@@@ -526,7 -525,7 +526,7 @@@ from .youtube import 
      YoutubeUserIE,
      YoutubeWatchLaterIE,
  )
 -from .zdf import ZDFIE
 +from .zdf import ZDFIE, ZDFChannelIE
  from .zingmp3 import (
      ZingMp3SongIE,
      ZingMp3AlbumIE,