Deal with RSpec deprecations.
Finish RSpec
Merged 'develop'.