Synchronized harmless changes from Chromium_v28 branch with Meld
Merge branch 'master' into Chromium_v28