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