Merge from emacs-24; up to 2014-06-08T18:27:22Z!eggert@cs.ucla.edu