Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu