Changes outside the code directory that should have been in changelist 184342.  Oops.
Merging spare-ring branch into master, from //info.ravenbrook.com/project/mps/branch/2014-01-25/spare-ring/...