Migrating rescale 0.7.1 changes into the trunk.