test grid image
Merge branch 'master' into splash_matt

-- just added test grid image in master; had DEFAULT_SCALES conflict