Merge branch 'master' of https://github.com/rg3/youtube-dl