[Rivet] [Rivet-svn] rivet: 8 new changesets

[David Grellscheid]

> PS. Just spotted the branch 

Thanks for spotting this. We'll need to roll this back on the 2-5-x
branch. It certainly can't go out in a third-digit release.

  David