Minor cleaning of master gisdk code.
Merge branch 'wsu' into develop