Gittrac #3930:  Initial partial implementation -- I'm not sure if
this is exactly how we want to do it (see remarks in ticket).  Also
no documentation yet.