Merge remote-tracking branch 'akretz/youtube_fix'