merge from rspec master

merge from rspec master