Merge pull request #843 from tphoney/rspec_mock