Merge branch 'ping-viki-shows'

diff --combined youtube_dl/extractor/__init__.py
index 6f8c261d5b416bcc7fd4f7a85185ece235030b57,173e9a15515a2a8325d7e86bb053bb3f3beded5e..24efb7ce50e27e371c84d1e85b3b6314f0624026
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -572,10 -572,6 +572,10 @@@ from .tumblr import TumblrI
  from .tunein import TuneInIE
  from .turbo import TurboIE
  from .tutv import TutvIE
 +from .tv2 import (
 +    TV2IE,
 +    TV2ArticleIE,
 +)
  from .tv4 import TV4IE
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
@@@ -647,7 -643,10 +647,10 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
- from .viki import VikiIE
+ from .viki import (
+     VikiIE,
+     VikiChannelIE,
+ )
  from .vk import (
      VKIE,
      VKUserVideosIE,