Merge branch 'chirbit' of https://github.com/skypher/youtube-dl into skypher-chirbit