Merge branch 'yinyuetai' of https://github.com/ping/youtube-dl into ping-yinyuetai