Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca