Comment 8 for bug 874296

Because of the volume of change here, I'm going to set the pullrequest tag but wait until someone is ready to commit it before I create the upgrade scripts; it seems likely that there will be conflict otherwise.