Merge r6461:6464 from jcorgan/t162-staging into trunk.