should driver.quit() be put last?
Merge branch 'master' into travis-sandbox