Commits in rspec/mainline:master