And I don't see more cases like these. But note that there are two different commits with the same message: Merge from emacs-24; up to 117669