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