Merged r5033:5116 from developer branch jcorgan/snd, with minor edits. Trunk passes...