Merge pull request #1961 from zoddicus/fixChromiumRoll