Merge remote-tracking branch 'd912e3/heise'

diff --combined youtube_dl/extractor/__init__.py
index f815e6b91d974de72615c506dbe16d5386e72941,d0417a1f2596c732fad3dc82727d2a40ba00a96a..64dcb72251e0c7355c3692749d3e2bbbad29d96c
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -135,13 -135,13 +135,14 @@@ from .gametrailers import GametrailersI
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
  from .godtube import GodTubeIE
 +from .golem import GolemIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
  from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
  from .grooveshark import GroovesharkIE
  from .hark import HarkIE
+ from .heise import HeiseIE
  from .helsinki import HelsinkiIE
  from .hentaistigma import HentaiStigmaIE
  from .hornbunny import HornBunnyIE
@@@ -262,7 -262,6 +263,7 @@@ from .nrk import 
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
 +from .oktoberfesttv import OktoberfestTVIE
  from .ooyala import OoyalaIE
  from .orf import (
      ORFTVthekIE,
@@@ -341,7 -340,6 +342,7 @@@ from .spankwire import SpankwireI
  from .spiegel import SpiegelIE, SpiegelArticleIE
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
 +from .sport5 import Sport5IE
  from .sportdeutschland import SportDeutschlandIE
  from .stanfordoc import StanfordOpenClassroomIE
  from .steam import SteamIE
@@@ -453,7 -451,6 +454,7 @@@ from .yahoo import 
      YahooNewsIE,
      YahooSearchIE,
  )
 +from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE
  from .youporn import YouPornIE