Updates from rspec-dev (2014-12-31)

These are some updates, generated from rspec-dev's rake tasks.
Because I made a local change and force pushed to each of the repo PRs but forgot to push the rspec-dev branch.  I made yet another change and force pushed to all branches so they should be in sync now.