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