Merge branch 'master' of git://github.com/rg3/youtube-dl into closed-captions