Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu