Merge from emacs-24; up to 2014-04-17T02:05:48Z!eggert@cs.ucla.edu