Avoid running the delegate setUpData code, wastes time for nothing
Merge branch 'master' of git://github.com/geotools/geotools