Attaching a patch.  See ChangeLog for details.