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