Upgraded to latest non-3 version of RSpec.