Merge branch 'master' into test
Fix youtube logo
Merge branch 'test'