Merge "Added non-uniform scaling for spatial sampling."