[chromium-freeworld/f30] (6 commits) ...Merge branch 'master' into f30