[pull] master from ytdl-org:master
# Conflicts: # youtube_dl/version.py
[ci skip]
Covered by generic extractor