[chromium-freeworld: 9/32] Merge branch 'master' into f26