Merge branch 'jove' of https://github.com/naglis/youtube-dl into naglis-jove