Merge branch 'moviefap' of https://github.com/gebn/youtube-dl into gebn-moviefap