Merged from miles@gnu.org--gnu-2005 (patch 117-118)