[pull] master from ytdl-org:master
# Conflicts: # youtube_dl/extractor/youtube.py
# Conflicts: # youtube_dl/extractor/vk.py