Merge branch 'corone17-patch-1'
[youtube-dl] / test / __init__.py