Small changes to work with latest Chromium.
Merge branch 'master' into gh-pages