This file has changed a lot since the previous release, and I resisted
the urge to do this until the conflicts would be minimized.