Merge branch 'charlierose' of https://github.com/TRox1972/youtube-dl into TRox1972...