Merge pull request #3078 from pulpe/youtube_fix