Rspec 3 syntax
Merge branch 'upgrade-rspec'