Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu