Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org