Merge jcorgan/sfg changeset 4089 into trunk.