Rspec 3 - Merge conflicts

Merge #17