fix rspec-rails with 2.13.1
Merge branch 'master' into travis_is_slow