Another try to get updates merged.

Mike,

I'm trying another pull request since the commits over the past 3 days didn't go through.  Is this a problem with the merge?  I think I've been merging on this end, but I'm not sure. 

Peter