Migrate to Capybara 2
Merge branch 'capybara2'