Merge branch 'atomicdryad-pr-bbcnews'
[youtube-dl] / test / __init__.py