Patch attached.  I'll push it in a few days if no one sees anything wrong with it.

Ken