Merged from miles@gnu.org--gnu-2005 (patch 610-614)