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