Merge pull request #1080 from pixelated/chromedriver