Changes between your master and my master

This should bring your master up to date.  It's a big change.