changes for rspec >= 2.14