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