Here are two commits I'd like to push to core-updates.
Comments and suggestions welcome.

     Mark