Merge from emacs-24; up to 2013-01-02T16:37:04Z!eggert@cs.ucla.edu