Merge remote-tracking branch 'capital-G/master'

diff --combined youtube_dl/extractor/__init__.py
index 0de0b45874d3270e5ca302de5edcd92ae66a6e87,e0957987c77349e363a7c567bcf07327c89f28c3..3023c3095dc1854a6e8c9b5f303ad22edcc6c38a
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -26,6 -26,7 +26,7 @@@ from .bandcamp import BandcampIE, Bandc
  from .bbccouk import BBCCoUkIE
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
+ from .bild import BildIE
  from .bilibili import BiliBiliIE
  from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
@@@ -367,7 -368,6 +368,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
 +from .telecinco import TelecincoIE
  from .telemb import TeleMBIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE