Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca