deal with non YT video metadata
Merge branch 'develop-safe'