[chromium-freeworld/f27: 33/37] Merge branch 'master' into f27