Branch for big updates, so that I can have broken intermediate states.

[SVN r53026]