Merge branch 'master' of https://github.com/zx8/youtube-dl into zx8-master

diff --combined youtube_dl/extractor/__init__.py
index 053eb32ae50f5db6071aabaa74f7f7521d798c54,3a0c42deda3f5e97412dd75833a0fb427c769078..d56eb64488fa5c1fc6c118709e4a6a797c78660d
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -420,6 -420,10 +420,10 @@@ from .rutube import 
  )
  from .rutv import RUTVIE
  from .sandia import SandiaIE
+ from .safari import (
+     SafariIE,
+     SafariCourseIE,
+ )
  from .sapo import SapoIE
  from .savefrom import SaveFromIE
  from .sbs import SBSIE
@@@ -526,10 -530,6 +530,10 @@@ from .tvp import TvpIE, TvpSeriesI
  from .tvplay import TVPlayIE
  from .tweakers import TweakersIE
  from .twentyfourvideo import TwentyFourVideoIE
 +from .twentytwotracks import (
 +    TwentyTwoTracksIE,
 +    TwentyTwoTracksGenreIE
 +)
  from .twitch import (
      TwitchVideoIE,
      TwitchChapterIE,
@@@ -551,7 -551,6 +555,7 @@@ from .ustream import UstreamIE, Ustream
  from .vbox7 import Vbox7IE
  from .veehd import VeeHDIE
  from .veoh import VeohIE
 +from .vessel import VesselIE
  from .vesti import VestiIE
  from .vevo import VevoIE
  from .vgtv import VGTVIE