rspec expect...to deprecations
Merge branch 'master' into deprecation
Merge pull request #2937 from jmay/deprecation

Fixed some deprecations in the spec suite