RSpec 3 changes.
Merge branch 'master' into staging