Merge from emacs-24; up to 2012-12-14T15:38:50Z!monnier@iro.umontreal.ca