Merge remote-tracking branch 'origin/master'

diff --combined youtube_dl/extractor/__init__.py
index 192baa9b898beef852cc06cde501d0c92f9f361f,b8d635c30e72f2e39bb85f6af76c3dbdfc466c24..1e8556124a00069cd7266c2d41c5cf432a5a7bc3
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -27,6 -27,7 +27,7 @@@ from .cbs import CBSI
  from .channel9 import Channel9IE
  from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
+ from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
  from .cmt import CMTIE
  from .cnn import CNNIE
@@@ -47,7 -48,6 +48,7 @@@ from .depositfiles import DepositFilesI
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
  from .defense import DefenseGouvFrIE
 +from .discovery import DiscoveryIE
  from .dropbox import DropboxIE
  from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE