Merge remote-tracking branch 'upstream/master'

Conflicts:
	youtube_dl/extractor/jeuxvideo.py

diff --cc youtube_dl/extractor/jeuxvideo.py
index d74a1c9b4ee19bcba5f322d23f5e4b8a1412d26e,4327bc13dab9c913eca8c4c263b6405e0dcc9076..c8a8ae1b3dca1dea6ba3d43ef6a2953dd77eac94
--- 1/youtube_dl/extractor/jeuxvideo.py
--- 2/youtube_dl/extractor/jeuxvideo.py
+++ b/youtube_dl/extractor/jeuxvideo.py
@@@ -18,6 -31,7 +31,8 @@@ class JeuxVideoIE(InfoExtractor)
  
          xml_config = self._download_webpage(xml_link, title,
                                                    'Downloading XML config')
++
+         config = xml.etree.ElementTree.fromstring(xml_config.encode('utf-8'))
          info = re.search(r'<format\.json>(.*?)</format\.json>',
                           xml_config, re.MULTILINE|re.DOTALL).group(1)
          info = json.loads(info)['versions'][0]