add the latest from Brinton
merging in.  No functional changes, I think