Synchronized with Chromium_v26 branch using Meld