merge the request in the correct branch.

...noply is not complaining anymore about dimension scales.