Merge branch 'patch-8239' of https://github.com/ping/youtube-dl into ping-patch-8239