Merged r6475:6484 from jcorgan/radar into trunk.