Merge branch 'TRox1972-charlierose'
[youtube-dl] / test / __init__.py