[chromium-freeworld: 25/148] Merge branch 'master' into f24