Merge branch 'youtube-dash-manifest'

Conflicts:
	youtube_dl/extractor/youtube.py

diff --cc youtube_dl/YoutubeDL.py
Simple merge

diff --cc youtube_dl/extractor/common.py
Simple merge

diff --cc youtube_dl/extractor/youtube.py
index 248b30ffb329d3870e0249e4d775c3f969849ce8,b943f19f9f14ebe372fff0adf280633246293a9d..870b7c4cabb502f870b7f1aeee9b5295156b3e29
--- 1/youtube_dl/extractor/youtube.py
--- 2/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -27,7 -27,7 +27,8 @@@ from ..utils import 
      get_element_by_id,
      get_element_by_attribute,
      ExtractorError,
+     int_or_none,
 +    RegexNotFoundError,
      unescapeHTML,
      unified_strdate,
      orderedSet,

diff --cc youtube_dl/utils.py
Simple merge