Rails version bump.
Update mocha to get the test suite to work.