Merge branch 'shahid' of https://github.com/remitamine/youtube-dl into remitamine...