Upgraded to RSpec 3.0.
Downgraded to RSpec 2.99.0.
Merge branch 'master' into staging