Merge pull request #24 from google/chrome/m54