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