Merge pull request #2957 from ianchi/youtube-dl