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