Fix for failing GIS tests.

(Re-submitted with more careful following of contrib guidelines.  Not including AUTHORS change as I have another pull request open already.)