Upgrade: capybara (2.0.2 ~> 2.1.0)
Merge remote-tracking branch 'upstream/master'