Merged from upstream.
Merge branch 'master' of github.com:phyllisstein/capybara-webkit

* 'master' of github.com:phyllisstein/capybara-webkit: