Merge r6160:6168 from jcorgan/fg into trunk.