Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu