A partial merge of r5954 from the bg-threads-1.1 branch. No reviewer.
Attach a file by drag & drop or click to upload
David Goodell authored