Migrated to RSpec 3
Merge branch 'rspec-3' into develop