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