commit: Automated merge with file:///home/aidan/xemacs-21.5-checked-out