Merge pull request #3818 from commodo/youtube-dl-fix