Merge branch 'jorams-dumpert'
[youtube-dl] / test / __init__.py