Summary: Forward port of changes from the 6-open train.
Reviewed-by: darcy, ohair, tbell
Contributed-by: NAndrew John Hughes <gnu_andrew@member.fsf.org>