Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca