Merge branch 'huajiao' of https://github.com/pyx/youtube-dl into pyx-huajiao