Sync summer work

Hmmm, I forgot all about this and nearly deleted it!  Get this into
the repository quick. (Only patch 472 now)