Merged jcorgan/sfg changeset r4048 into trunk.