[chromium-freeworld/f29] (2 commits) ...Merge branch 'master' into f29
Summary of changes:
4bf784f... apply upstream fix to resolve issue where it is dangerous t (*)
fb8458d... Merge branch 'master' into f29
(*) This commit already existed in another branch; no separate mail sent